natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-2.2' into trunk

This commit is contained in:
Joshua McKenzie 2015-07-13 17:54:14 -04:00
parent 3b5ab3a473 052222615a
commit fbf52e65f1
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bin/stop-server.ps1
View File

@ -125,7 +125,10 @@ Function KillProcess
// Must wait here. If we don't and re-enable Ctrl-C
// handling below too fast, we might terminate ourselves.
proc.WaitForExit(2000);
bool exited = proc.WaitForExit(30000);
if(!exited)
proc.Kill();
FreeConsole();
// Re-attach to current console to write output
@ -137,7 +140,12 @@ Function KillProcess
SetConsoleCtrlHandler(null, false);
if (!silent)
System.Console.WriteLine("Successfully sent ctrl+c to process with id: " + pidToKill + ".");
{
if(exited)
System.Console.WriteLine("Successfully sent ctrl+c to process with id: " + pidToKill + ".");
else
System.Console.WriteLine("Process with id: " + pidToKill + " did not exit after 30 seconds, killed.");
}
}
else
{