[Box Backup-commit] COMMIT r3611 - box/trunk/lib/server
subversion at boxbackup.org
subversion at boxbackup.org
Thu Aug 6 20:12:58 BST 2015
Author: chris
Date: 2015-08-06 19:12:58 +0000 (Thu, 06 Aug 2015)
New Revision: 3611
Modified:
box/trunk/lib/server/ServerControl.cpp
Log:
Shorten minimum sleep while waiting for test daemons to die
Modified: box/trunk/lib/server/ServerControl.cpp
===================================================================
--- box/trunk/lib/server/ServerControl.cpp 2015-08-06 19:11:07 UTC (rev 3610)
+++ box/trunk/lib/server/ServerControl.cpp 2015-08-06 19:12:58 UTC (rev 3611)
@@ -15,6 +15,7 @@
#include <signal.h>
#endif
+#include "BoxTime.h"
#include "ServerControl.h"
#include "Test.h"
@@ -197,18 +198,18 @@
}
#endif
- for (int i = 0; i < 30; i++)
+ printf("Waiting for server to die (pid %d): ", pid);
+
+ for (int i = 0; i < 300; i++)
{
- if (i == 0)
+ if (i % 10 == 0)
{
- printf("Waiting for server to die (pid %d): ", pid);
+ printf(".");
+ fflush(stdout);
}
- printf(".");
- fflush(stdout);
-
if (!ServerIsAlive(pid)) break;
- ::sleep(1);
+ ShortSleep(MilliSecondsToBoxTime(100), false);
if (!ServerIsAlive(pid)) break;
}
More information about the Boxbackup-commit
mailing list