[Commits] r515 - trunk/daemon/src

[new-commit at lists.openvcp.org]

Author: ftx
Date: 2008-01-12 20:22:16 +0000 (Sat, 12 Jan 2008)
New Revision: 515

Modified:
   trunk/daemon/src/misc.c
   trunk/daemon/src/request.c
Log:
raising timeout, killing process in case of a timeout



Modified: trunk/daemon/src/misc.c
===================================================================
--- trunk/daemon/src/misc.c	2007-12-22 07:23:48 UTC (rev 514)
+++ trunk/daemon/src/misc.c	2008-01-12 20:22:16 UTC (rev 515)
@@ -340,7 +340,9 @@
 
         if(fork() == 0)
         {
-                close(1);
+                alarm(exectime);
+
+		close(1);
                 close(2);
                 dup(pipe_fds[1]);
                 dup(pipe_fds[1]);

Modified: trunk/daemon/src/request.c
===================================================================
--- trunk/daemon/src/request.c	2007-12-22 07:23:48 UTC (rev 514)
+++ trunk/daemon/src/request.c	2008-01-12 20:22:16 UTC (rev 515)
@@ -129,7 +129,7 @@
 	
 	response = ovcp_response_new();
 			
-	output = exec_cmd("vserver", 30, "vserver", name, "start", NULL);
+	output = exec_cmd("vserver", 900, "vserver", name, "start", NULL);
 
 	trim_string(output);
 	ovcp_response_add_string(response, output);
@@ -182,7 +182,7 @@
 	
 	response = ovcp_response_new();
 			
-	output = exec_cmd("vserver", 30, "vserver", name, "stop", NULL);
+	output = exec_cmd("vserver", 900, "vserver", name, "stop", NULL);
 	
 	trim_string(output);
 	ovcp_response_add_string(response, output);