Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Reis
argotest
Commits
c9580560
Commit
c9580560
authored
Dec 21, 2018
by
Valentin Reis
Browse files
Removed pkills from the stack tests.
parent
63c8d3fa
Pipeline
#4783
passed with stage
in 40 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
argo/src/Argo/Stack.hs
View file @
c9580560
...
...
@@ -40,23 +40,23 @@ import Data.Maybe
import
Control.Foldl
as
Fold
cleanLeftoverProcesses
::
Shell
()
cleanLeftoverProcesses
=
do
printInfo
"Cleaning leftover processes.
\n
"
daemon
<-
myWhich
"daemon"
verboseShell
(
format
(
"pkill "
%
fp
)
daemon
)
empty
cmd
<-
myWhich
"cmd"
void
$
verboseShell
(
format
(
"pkill "
%
fp
)
cmd
)
empty
daemon_wrapped
<-
myWhichMaybe
".daemon-wrapped"
E
.
whenJust
daemon_wrapped
(
\
x
->
void
$
verboseShell
"pkill .daemon-wrapped"
empty
)
cmd_wrapped
<-
myWhichMaybe
".cmd-wrapped"
void
$
E
.
whenJust
cmd_wrapped
(
\
x
->
void
$
verboseShell
"pkill .cmd-wrapped"
empty
)
{-
cleanLeftoverProcesses :: Shell ()
-}
{-
cleanLeftoverProcesses = do
-}
{-
printInfo "Cleaning leftover processes.\n"
-}
{-
daemon <- myWhich "daemon"
-}
{-
verboseShell (format ("pkill " % fp) daemon) empty
-}
{-
cmd <- myWhich "cmd"
-}
{-
void $ verboseShell (format ("pkill " % fp) cmd) empty
-}
{-
daemon_wrapped <- myWhichMaybe ".daemon-wrapped"
-}
{-
E.whenJust daemon_wrapped
-}
{-
(\x -> void $ verboseShell "pkill .daemon-wrapped" empty)
-}
{-
cmd_wrapped <- myWhichMaybe ".cmd-wrapped"
-}
{-
void $ E.whenJust cmd_wrapped
-}
{-
(\x -> void $ verboseShell "pkill .cmd-wrapped" empty)
-}
cleanLeftovers
::
StackArgs
->
Shell
()
cleanLeftovers
StackArgs
{
..
}
=
do
cleanLeftoverProcesses
{-
cleanLeftoverProcesses
-}
printInfo
"Cleaning leftover files.
\n
"
CM
.
mapM_
cleanLog
...
...
default.nix
View file @
c9580560
...
...
@@ -111,6 +111,4 @@ in rec
inherit
shellHook
;
MANIFESTS
=
./manifests
;
};
}
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment