Changeset 985 for trunk/zoo-project/zoo-kernel/server_internal.c

Timestamp:

Mar 9, 2021, 10:00:04 AM (3 years ago)

Author:

djay

Message:

Move jobs management and execution endpoint from /processes/{procssId}/jobs to /jobs

File:

• trunk/zoo-project/zoo-kernel/server_internal.c (modified) (2 diffs)

trunk/zoo-project/zoo-kernel/server_internal.c

@@ -1143 +1143 @@
     if(dirp!=NULL){
       while ((dp = readdir(dirp)) != NULL){
-#ifdef DEBUG
-        fprintf(stderr,"File : %s searched : %s\n",dp->d_name,tmp);
-#endif
         if(strstr(dp->d_name,pid)!=0){
           sprintf(fileName,"%s/%s",r_inputs->value,dp->d_name);
@@ -1164 +1161 @@
       }
     }
-    map* pmStatusFile=getMapFromMaps(conf,"lenv","file.statusFile");
-    if(pmStatusFile!=NULL && zUnlink(pmStatusFile->value)!=0){
-        if(e_type==NULL || strncasecmp(e_type->value,"json",4)!=0)
-          errorException (conf, 
-                          _("The job cannot be removed, a file cannot be removed"),
-                          "NoApplicableCode", NULL);
-        else{
-          setMapInMaps(conf,"lenv","error","true");
-                    setMapInMaps(conf,"lenv","code","NoApplicableCode");
-                    setMapInMaps(conf,"lenv","message",_("The job cannot be removed, a file cannot be removed"));
-        }
-        return;
-      }
 #ifdef RELY_ON_DB
     removeService(conf,pid);
 #endif
     if(e_type==NULL || strncasecmp(e_type->value,"json",4)!=0){
-      /* No need to call 7_1 when an execution is dismissed.
-         fprintf(stderr,"************************* %s %d \n\n",__FILE__,__LINE__);
-         invokeCallback(conf,NULL,NULL,7,1);
-         fprintf(stderr,"************************* %s %d \n\n",__FILE__,__LINE__);
-      */
       map* statusInfo=createMap("JobID",pid);
       addToMap(statusInfo,"Status","Dismissed");