DistRen Changeset - 68948a4680f1 · protofusion repositories

Changeset - 68948a4680f1

Parent rev.

Child rev.

[Not reviewed]

default

1 2 1

Nathan Brink (binki) - 16 years ago 2009-10-10 01:07:03
ohnobinki@ohnopublishing.net

fix reading of and renamed server conf

3 files changed with 4 insertions and 4 deletions:

etc/Makefile.am

etc/distrendaemon.conf

src/server/distrend.c

0 comments (0 inline, 0 general)

etc/Makefile.am

➞

Show inline comments

		sysconf_DATA = distrenclient.conf distrencommon.conf ~~distrenserver~~.conf distrenslave.conf
		sysconf_DATA = distrenclient.conf distrencommon.conf distrendaemon.conf distrenslave.conf

etc/distrendaemon.conf

➞

Show inline comments

@@ file renamed from etc/distrenserver.conf to etc/distrendaemon.conf @@
 /*
  configuration for _this_ server
 */
-me
+daemon
+{
   datadir = "/var/lib/distren"
   render_types = {"povray", "blender", "inkscape", "imagemagick", "dcraw"}
+}
 include("distrencommon.conf")
 datadir = "/var/lib/distren"
 listen {
        type = "unix"
        path = "/var/run/distrend.sock"
        port = "0770"
+}
@@ \ No newline at end of file @@

src/server/distrend.c

➞

Show inline comments

@@ @@ -434,49 +434,49 @@ int distrend_do_config(int argc, char *a @@
           CFGF_MULTI),
       CFG_SIMPLE_STR("datadir", NULL),
       CFG_END()
     };
   struct distrenjob *distrenjob;
   int tmp;
   xmlinit();
   /*
    * test xml2distrenjob()
    */
   tmp = xml2distrenjob(&distrenjob, "distrenjob.xml.example");
   if(tmp)
     fprintf(stderr, "xml2distrenjob() returned %d. Try to cd to distren/doc if you want to test out the xml2distrenjob() function. (This will only fix this error if the error is due to an inability of the xml library to access distrenjob.xml.example)\n\n", tmp);
   else
     fprintf(stderr, "using email ``%s'' for user ``%s'' -- reading in XML files and pulling data from them using libxml2+XPath works!!!\n", distrenjob->email, distrenjob->submitter);
   fprintf(stderr, "%s:%d running config\n", __FILE__, __LINE__);
   *config = malloc(sizeof(struct distrend_config));
   myopts[1].simple_value = &(*config)->datadir;
-  options_init(argc, argv, &(*config)->mycfg, myopts, "server", &(*config)->options);
+  options_init(argc, argv, &(*config)->mycfg, myopts, "daemon", &(*config)->options);
   fprintf(stderr, "using %s as datadir\n", (*config)->datadir);
   xmlcleanup();
   return 0;
+}
 int distrend_config_free(struct distrend_config *config)
+{
   options_free(config->options);
   free(config);
   return 0;
+}
 /* ************************** XML Functions ************************* */
 // returns 1 on successful completion of xml file
 int makeSlaveDataXML(struct distrenjob *job)
+{
   xmlTextWriterPtr writer;
   char *tmp; // temporarily holds strings to be given to the xml writer
   _distren_asprintf(&tmp, "stor/job%d/job_info.xml", job->jobnum);
   // create xml document at the location tmp with no compression

0 comments (0 inline, 0 general)