DistRen Changeset - 5964e275c410 · protofusion repositories

Changeset - 5964e275c410

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Nathan Brink (binki) - 16 years ago 2009-12-12 17:03:42
ohnobinki@ohnopublishing.net

slave: reorganize vars, correct config gathering, error handling

4 files changed with 62 insertions and 38 deletions:

etc/distrenslave.conf.in

src/server/slave.c

src/server/slavefuncs.c

src/server/slavefuncs.h

0 comments (0 inline, 0 general)

etc/distrenslave.conf.in

➞

Show inline comments

 slave
+{
   username = "!username"
   datadir = "@LOCALSTATEDIR@/@PACKAGE@"
   hostname = "protofusion.org"
+}
 include("distrencommon.conf")
@@ \ No newline at end of file @@
 include("distrencommon.conf")

src/server/slave.c

➞

Show inline comments

@@ @@ -26,27 +26,69 @@ @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
 int main(int argc, char *argv[])
+{
   char curopt;
   int tmp;
   char *datadir;
   char *server;
   char *username;
   cfg_opt_t myopts[] = {
     CFG_SIMPLE_STR("username", &username),
     CFG_SIMPLE_STR("datadir", &datadir),
     CFG_SIMPLE_STR("server", &server),
     CFG_END()
   };
   cfg_t * my_cfg;
   struct options_common *commonopts;
   int jobnum = 0;
   int framenum = 0;
   char *urltoTar;      /* Full URL to the server-side location of job#.tgz */
   char *pathtoTar;     /* Full path to the location of the job#.tgz */
   while(-1 != (curopt = getopt(argc, argv, "u:h")))
   char *urltoOutput;   /* Full URL where output is posted */
   char *pathtoJobfile; /* Full path to the job's main file */
   char *pathtoXml;     /* Full path to the job's xml file */
   char *pathtoOutput;  /* Full path to the output (rendered) file */
   char *outputExt;     /* Output Extension (e.g., JPG) */
   char *tarcmd;        /* Command to run for tar. Migrate to libtar sometime */
   char *outdir;        /* Output Directory for tar */
   char *jobdatapath;   /* Path to job data */
   struct distrenjob *myjob; /* Structure to hold data gathered from the XML file */
   struct remoteio *comm_slave;
   /**
      initializations
   */
   datadir = NULL;
   server = NULL;
   username = NULL;
   while(((char)-1) != (curopt = getopt(argc, argv, "u:h")))
+     {
        if(curopt == ':')
+         {
            fprintf(stderr, "-%c: is missing an argument\n", optopt);
            return 1;
+         }
        else if(curopt == '?')
+         {
            fprintf(stderr, "-%c: invalid option specified\n", optopt);
            return 1;
+         }
        else if(curopt == 'h')
@@ @@ -54,33 +96,24 @@ int main(int argc, char *argv[]) @@
            fprintf(stderr, "Usage: distrenslave [option] \nStarts a distren slave\n\t-u\tset username (run after fresh install)\n\t-h\tshow this help\n");
            return 2;
+         }
        else if(curopt == 'u')
          username = strdup(optarg);
          fprintf(stderr, "Putting username \"%s\" in distrenslave.conf\n", username);
          conf_replace("distrenslave.conf", "!username", username);
          fprintf(stderr, "Please invoke distrenslave with no arguments to run with the username you just set\n");
          return 0;
+     }
   /* Get conf data */
   char *datadir;
   cfg_t * my_cfg;
   cfg_opt_t myopts[] = {
     CFG_SIMPLE_STR("username", &username),
     CFG_SIMPLE_STR("datadir", &datadir),
     CFG_END()
   };
   struct options_common *commonopts;
   username = NULL;
   options_init(argc, argv, &my_cfg, myopts, "slave", &commonopts);
   /* Notifies the user if there no username in .conf */
   if(username == NULL || strcmp(username, "!username") == 0 )
     fprintf(stderr, "\nPlease ensure that your username is present in distrenslave.conf\n");
   else
     if( username != NULL || strcmp(username, "!username") != 0 )
+      {
 	// Log in the user
 	if(login_user(username) == 1){
 	  fprintf(stderr, "You should now be logged into distren.\n");
@@ @@ -88,49 +121,35 @@ int main(int argc, char *argv[]) @@
 	else
+	  {
 	    fprintf(stderr, "Login failed, please check your username. If you have not registered, please do so on the DistRen website.\n");
 	    return 0;
+	  }
+      }
     else
+      {
 	fprintf(stderr, "Please check your distrenslave.conf, it appears to be incorrectly formatted.\n");
+      }
   int jobnum = 0;
   int framenum = 0;
   char *urltoTar;      /* Full URL to the server-side location of job#.tgz */
   char *pathtoTar;     /* Full path to the location of the job#.tgz */
   char *urltoOutput;   /* Full URL where output is posted */
   char *pathtoJobfile; /* Full path to the job's main file */
   char *pathtoXml;     /* Full path to the job's xml file */
   char *pathtoOutput;  /* Full path to the output (rendered) file */
   char *outputExt;     /* Output Extension (e.g., JPG) */
   fprintf(stderr, "Loading config (fasten your seatbelts for a SEGFAULT :-D )...\n");
   char *tarcmd;        /* Command to run for tar. Migrate to libtar sometime */
   char *outdir;        /* Output Directory for tar */
   char *jobdatapath;   /* Path to job data */
   struct distrenjob *myjob; /* Structure to hold data gathered from the XML file */
   struct remoteio_opts *comm_slaveopts = {"ssh"};
   struct execio *remoteExec;
   struct remoteio *comm_slave = {0, comm_slaveopts, remoteExec}; /* Structures for remotio */
   fprintf(stderr,"Connecting to server...\n");
   remoteio_open(&comm_slave, comm_slaveopts, "protofusion" );
   fprintf(stderr, "Connecting to server...\n");
   tmp = remoteio_open(&comm_slave, commonopts->remoteio, server);
   if(tmp)
+    {
       fprintf(stderr, "Error connecting to server; exitting\n");
       return 1;
+    }
   int haveWork = 0;
   while(1)
+    {
     // request work
     fprintf(stderr,"Requesting work...\n");
     sendSignal(comm_slave, DISTREN_REQUEST_GETWORK);
     /* If we got a frame */
     if(haveWork)

src/server/slavefuncs.c

➞

Show inline comments

@@ @@ -27,31 +27,34 @@ @@
 #include <curl/curl.h>
 #include <curl/easy.h>
 #include <curl/types.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 // Sends the server a single request (see protocol.h)
 int sendSignal(struct remoteio *rem, int signal){
 /**
    Sends the server a single request (see protocol.h)
 */
 int sendSignal(struct remoteio *rem, int signal)
+{
   size_t written;
   char *ssignal;
   _distren_asprintf(&ssignal,"%d",signal);
+  _distren_asprintf(&ssignal, "%d", signal);
   while( !remoteio_write(rem, ssignal, strlen(ssignal), &written) )
     fprintf(stderr,"Writing...");
+    fprintf(stderr, "Writing...");
   return 0;
+}
 /**
  utility function for XPath-ish stuff:
  */
 xmlNodePtr xml_quickxpath(xmlXPathContextPtr xpathctxt, xmlChar *path)
+{
   xmlNodePtr toreturn;
   xmlXPathObjectPtr xmlxpathobjptr;
   xmlxpathobjptr = xmlXPathEval(path, xpathctxt);
   if(!xmlxpathobjptr

src/server/slavefuncs.h

➞

Show inline comments

@@ @@ -12,24 +12,25 @@ @@
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Affero General Public License for more details.
   You should have received a copy of the GNU Affero General Public License
   along with DistRen.  If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef _DISTREN_SLAVEFUNCS_H
 #define _DISTREN_SLAVEFUNCS_H
 #include "distrenjob.h"
 #include "remoteio.h"
 #include <libxml/xpath.h>
 #include <stdio.h>
 struct msg;
 int sendSignal(struct remoteio *rem, int signal);
 xmlNodePtr xml_quickxpath(xmlXPathContextPtr xpathctxt, xmlChar *path);
 int software_updatecheck();
 int delete_jobdata(int jobnum, char *datadir);
 size_t curl_writetodisk(void *ptr, size_t size, size_t nmemb, FILE *stream);
 int curlget(char *url, char *out);

0 comments (0 inline, 0 general)