Changeset 20

Timestamp:

04/01/14 12:59:46 (9 years ago)

Author:

willem

Message:

willem

Location:

trunk

Files:

• Make.inc (modified) (3 diffs)
• modulefile (modified) (2 diffs)
• stopos.h (modified) (1 diff)
• stoposclient.cpp (modified) (4 diffs)

trunk/Make.inc

@@ -7 +7 @@
 
 # installation directory of the server on the remote system
-REMOTE_CGI_INSTALL_DIR=stopos.osd.surfsara.nl:/usr/local/stopos/cgi-bin
+#REMOTE_CGI_INSTALL_DIR=stopos.osd.surfsara.nl:/usr/local/stopos/cgi-bin
+REMOTE_CGI_INSTALL_DIR=localhost:/home/willem/www/cgi-bin
 
 # location of the client programs:
@@ -13 +14 @@
 
 # remote installation directory of the client programs:
-REMOTE_CLIENT_INSTALL_DIR=stopos.osd.surfsara.nl:/usr/local/stopos/bin
+#REMOTE_CLIENT_INSTALL_DIR=stopos.osd.surfsara.nl:/usr/local/stopos/bin
+REMOTE_CLIENT_INSTALL_DIR=localhost:/usr/local/stopos/bin
 
 # location of the modulefile
@@ -44 +46 @@
 # Define directory to store the non-mysql databases 
 # default is /tmp
-DB_DIR=/data/stopos
+# DB_DIR=/data/stopos
 

trunk/modulefile

@@ -1 +1 @@
 #%Module
 ##
-##        stopos 0.92
+##        stopos 0.93
 ##
 
@@ -8 +8 @@
 }
 
-set root /home/willem/myroot/sara/sw/stopos-0.92
+set root /home/willem/myroot/sara/sw/stopos-0.93
 
 if { [ module-info shelltype ] == "csh" } {

trunk/stopos.h

@@ -24 +24 @@
                                           // key from extra key
 const std::string program_name    = "stopos";
-const std::string program_version = "0.92";
+const std::string program_version = "0.93";
 const std::string default_pool    = "pool";
 

trunk/stoposclient.cpp

@@ -23 +23 @@
 #include "shellenv.h"
 #include "stopos.h"
+#define  CONNECT_ERROR_MSG "ERROR: Cannot connect to server"
+#define  CONNECT_ERROR_RETRIES 10
 
 struct returnvalue
@@ -121 +123 @@
 int handle_add(wrequest &w,const std::string &fname,returnvalue &r, const bool quiet)
 {
-  size_t number_of_lines;
+  size_t number_of_lines=0;
 
   bool read_from_stdin = 0;
@@ -171 +173 @@
     w.set_value(line);
 
-    rc = w.send_message(body,header);
-
+    for (int i=0; i<CONNECT_ERROR_RETRIES; i++)
+    {
+      rc = w.send_message(body,header);
+      if (rc == 0) break;
+      sleep(1);
+    }
     if (rc != 0)
     {
-      r.msg = "ERROR: Cannot connect to server";
+      r.msg = CONNECT_ERROR_MSG;
       return 1;
     }
+
     r.parse(body);
     if (r.msg != "OK")
@@ -420 +427 @@
     std::string body,header;
 
-    rc = w.send_message(body,header);
-
+    for (int i=0; i<CONNECT_ERROR_RETRIES; i++)
+    {
+      rc = w.send_message(body,header);
+      if (rc == 0) break;
+      sleep(1);
+    }
     if (rc != 0)
-      r.msg = "ERROR: Cannot connect to server";
+      r.msg = CONNECT_ERROR_MSG;
     else
       r.parse(body);