avoid waiting forever
This commit is contained in:
parent
d57576d5dd
commit
7f7ac5d92c
@ -510,6 +510,7 @@ main (int argc,
|
|||||||
char * const *argv)
|
char * const *argv)
|
||||||
{
|
{
|
||||||
struct GNUNET_OS_Process *bankd;
|
struct GNUNET_OS_Process *bankd;
|
||||||
|
unsigned int cnt;
|
||||||
|
|
||||||
GNUNET_log_setup ("test-bank-api",
|
GNUNET_log_setup ("test-bank-api",
|
||||||
"WARNING",
|
"WARNING",
|
||||||
@ -530,19 +531,30 @@ main (int argc,
|
|||||||
/* give child time to start and bind against the socket */
|
/* give child time to start and bind against the socket */
|
||||||
fprintf (stderr,
|
fprintf (stderr,
|
||||||
"Waiting for taler-bank-manage to be ready");
|
"Waiting for taler-bank-manage to be ready");
|
||||||
|
cnt = 0;
|
||||||
do
|
do
|
||||||
{
|
{
|
||||||
fprintf (stderr, ".");
|
fprintf (stderr, ".");
|
||||||
sleep (1);
|
sleep (1);
|
||||||
|
cnt++;
|
||||||
|
if (cnt > 30)
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
while (0 != system ("wget -q -t 1 -T 1 http://127.0.0.1:8081/ -o /dev/null -O /dev/null"));
|
while (0 != system ("wget -q -t 1 -T 1 http://127.0.0.1:8081/ -o /dev/null -O /dev/null"));
|
||||||
fprintf (stderr, "\n");
|
fprintf (stderr, "\n");
|
||||||
result = GNUNET_SYSERR;
|
result = GNUNET_SYSERR;
|
||||||
|
if (cnt <= 30)
|
||||||
GNUNET_SCHEDULER_run (&run, NULL);
|
GNUNET_SCHEDULER_run (&run, NULL);
|
||||||
GNUNET_OS_process_kill (bankd,
|
GNUNET_OS_process_kill (bankd,
|
||||||
SIGTERM);
|
SIGTERM);
|
||||||
GNUNET_OS_process_wait (bankd);
|
GNUNET_OS_process_wait (bankd);
|
||||||
GNUNET_OS_process_destroy (bankd);
|
GNUNET_OS_process_destroy (bankd);
|
||||||
|
if (cnt > 30)
|
||||||
|
{
|
||||||
|
fprintf (stderr,
|
||||||
|
"taler-bank-manage failed to start properly.\n");
|
||||||
|
return 77;
|
||||||
|
}
|
||||||
return (GNUNET_OK == result) ? 0 : 1;
|
return (GNUNET_OK == result) ? 0 : 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user