diff --git a/src/server/slavefuncs.c b/src/server/slavefuncs.c --- a/src/server/slavefuncs.c +++ b/src/server/slavefuncs.c @@ -295,7 +295,7 @@ int exec_blender(char *input, char *outp char *command = "blender"; // @TODO: We currently expect this to be in PATH char *cmd[] = { command, "-b", "-o", output, input, "-f", frame_str, (char *)NULL }; // arguments for blender - fprintf(stderr,"Preparing to execute command: %s \"-b\" \"-o\" %s %s \"-f\" %s\n", command, output, input, frame_str); + fprintf(stderr,"Preparing to execute command: %s -b -o %s %s -f %s\n", command, output, input, frame_str); char buf[10]; struct execio *testrem; @@ -303,10 +303,10 @@ int exec_blender(char *input, char *outp fprintf(stderr,"Executing: %s\n", frame_str); ret = execio_open(&testrem, command, cmd); - buf[9] = '\0'; - while(!execio_read(testrem, buf, 9, &readlen)) + buf[20] = '\0'; + while(!execio_read(testrem, buf, 20, &readlen)) { - if(readlen > 9) { + if(readlen > 20) { fprintf(stderr, "Something is terribly wrong!\n"); } buf[readlen] = '\0'; @@ -377,11 +377,6 @@ int downloadTar(char *url, char *destina free(url); return 1; // Eventually make a retry loop } - else if(ret == 2){ - fprintf(stderr, "Output directory \"%s\" does not exist!\n",destinationPath); - free(url); - return 3; - } } else{ fprintf(stderr, "Tar already exists! Download cancelled.\n"); @@ -477,14 +472,17 @@ int unpackJob(char *outdir, char *pathto } -void prepareJobPaths(int jobnum, int framenum, char *outputExt, char *datadir, char **urltoTar,char **pathtoTar,char **pathtoJob, char **pathtoJobfile,char **urltoOutput,char **pathtoOutput, char **pathtoOutdir) +void prepareJobPaths(int jobnum, int framenum, char *outputExt, char *datadir, char **urltoTar,char **pathtoTar,char **pathtoTardir,char **pathtoJob, char **pathtoJobfile,char **urltoOutput,char **pathtoOutput, char **pathtoOutdir) { // Variable Preparation char *jobdatapath; _distren_asprintf(&jobdatapath, "job%d", jobnum); _distren_asprintf(urltoTar, "http://data.distren.org/job%d/job%d.tar.gz", jobnum, jobnum); // Prepares URL to download from _distren_asprintf(pathtoTar, "%s/%s/job%d.tar.gz", datadir, jobdatapath, jobnum); // Prepares destination to save to + _distren_asprintf(pathtoTardir, "%s/%s/", datadir, jobdatapath); // Prepares destination to save to + _distren_asprintf(pathtoJob, "%s/%s/", datadir, jobdatapath); + _distren_asprintf(pathtoJobfile, "%s/%s/job.blend", datadir, jobdatapath ); // Prepares the path to the jobfile _distren_asprintf(urltoOutput, "http://distren.org/slaveUpload.php"); // Prepares the URL where output is posted _distren_asprintf(pathtoOutput, "%s/%s/output/job%d-frame%d.%s", datadir, jobdatapath, jobnum, framenum, outputExt ); @@ -646,7 +644,7 @@ struct _web_memorystruct _web_getrequest curl_global_cleanup(); if(!strncmp(chunk.memory, "ERROR", 5)) - fprintf(stderr, "Web request returned error!\n"); + fprintf(stderr, "Server request returned error %s!\n", chunk.memory); return chunk; // 0 is OK, 1 is 404 or other error }