DistRen Changeset - 9cf7971fa223 · protofusion repositories

Changeset - 9cf7971fa223

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Ethan Zonca (ethanzonca) - 15 years ago 2010-09-03 00:25:24
e@ethanzonca.com

Random changes, reduced polling time for dev work

2 files changed with 2 insertions and 2 deletions:

src/server/simpleslave.c

src/server/slavefuncs.c

0 comments (0 inline, 0 general)

src/server/simpleslave.c

➞

Show inline comments

@@ @@ -306,25 +306,25 @@ if(updateConf){ @@
           free(pathtoOutput);
           urltoOutput = NULL;
           pathtoOutput = NULL;
           // Tell the server that rendering and upload are complete
           _web_finishframe(slavekey, password, jobnum, framenum);
+        }
+      }
     else{
       if(DEBUG)
         fprintf(stderr,"No work to do. Idling...\n");
       else
         fprintf(stderr,".");
-      sleep(300); // Poll every 300 seconds @TODO: remove polling
+      sleep(60); // Poll every 300 seconds @TODO: remove polling
+    }
     // @TODO: If the server says that every frame for the last jobnum is finished, OR if the data is getting old
     if(1 == 0)
+      {
         // Note: individual frames are already deleted after uploading,
         // except for ones that couldn't be uploaded
         delete_jobdata(jobnum, datadir);
+      }
+  }
   free(my_cfg);

src/server/slavefuncs.c

➞

Show inline comments

@@ @@ -380,25 +380,25 @@ int downloadTar(char *url, char *destina @@
     fprintf(stderr, "Tar at %s already exists! Download cancelled.\n", destinationPath);
   return 2;
+}
 int uploadOutput(char *pathtoOutput, char *urltoOutput, int jobnum, int framenum, int slavekey){
   //fprintf(stderr,"Uploading output %s to url %s for job %d and frame %d for slavekey %d", pathtoOutput, urltoOutput, jobnum, framenum, slavekey);
   if( !curlpost(pathtoOutput, urltoOutput, jobnum, framenum, slavekey)) // Uploads output
+    {
       if(DEBUG)
         fprintf(stderr,"Upload successful, removing old output...\n");
       else
         fprintf(stderr,"Uploaded\n");
+        fprintf(stderr,"Uploaded.\n");
       remove(pathtoOutput); // Delete the file after its uploaded
       return 0;
+    }
   else
+    {
       fprintf(stderr,"Upload failed. Check your network connection. Retrying upload...\n");
       int tries=1;
       while(tries<=10 && curlpost(pathtoOutput, urltoOutput, jobnum, framenum, slavekey))
+        {
           fprintf(stderr, "Upload failed. Trying again in 10 seconds... (attempt %d of 10)\n", tries);
           tries++;

0 comments (0 inline, 0 general)