Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emulab
emulab-devel
Commits
c960e788
Commit
c960e788
authored
May 06, 2016
by
Mike Hibler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix a print statement, increase the timeout by a smidge.
parent
50d0e370
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
clientside/tmcc/common/rc.linktest
clientside/tmcc/common/rc.linktest
+4
-4
No files found.
clientside/tmcc/common/rc.linktest
View file @
c960e788
#!/usr/bin/perl -w
#
# Copyright (c) 2000-201
3
University of Utah and the Flux Group.
# Copyright (c) 2000-201
6
University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
...
...
@@ -104,14 +104,14 @@ my $server = getlocalevserver();
my
$args
=
"
-s
$server
-l
$logfile
-i
$pidfile
-k
$keyfile
-u
$swapper
";
#
# Only wait for
60 second
s, to avoid pointless wait forever.
# Only wait for
a couple of minute
s, to avoid pointless wait forever.
# We will report an error.
#
my
$childpid
=
fork
();
if
(
$childpid
)
{
my
$timedout
=
0
;
local
$SIG
{
ALRM
}
=
sub
{
kill
("
TERM
",
$childpid
);
$timedout
=
1
;
};
alarm
9
0
;
alarm
12
0
;
waitpid
(
$childpid
,
0
);
alarm
0
;
...
...
@@ -120,7 +120,7 @@ if ($childpid) {
#
if
(
$?
||
$timedout
)
{
print
STDERR
"
*** ERROR: linktest daemon failed to start.
";
print
STDERR
(
$
?
?
"
Status: $?
"
:
"
Timed out.
")
.
"
\n
";
print
STDERR
(
$
timedout
?
"
Timed out
"
:
"
Status: $?
")
.
"
.
\n
";
exit
(
-
1
);
}
exit
(
0
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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