Changeset 860 for branches/prototype-v0/zoo-project/zoo-kernel/ulinet.c

Timestamp:

Dec 12, 2017, 4:09:47 PM (6 years ago)

Author:

djay

Message:

Add status_code key to the lenv section to support returning a specific HTTP error code from the service code. Fix callback invocation to support inputs arrays at step 1 and 2. Fix issue with cpu usage. Fix issue with mapserver publication when an input is optional. Fix callback invocation at step 7 in case the service has failed on the HPC side.

File:

• branches/prototype-v0/zoo-project/zoo-kernel/ulinet.c (modified) (3 diffs)

branches/prototype-v0/zoo-project/zoo-kernel/ulinet.c

@@ -316 +316 @@
   if(passThrough!=NULL && targetHosts!=NULL){
     char *tmp=zStrdup(passThrough->value);
-    char *token, *saveptr;
-    token = strtok_r (tmp, ",", &saveptr);
     int i;
     for(i=0;i<handle->nb;i++){
       if(strstr(targetHosts->value,"*")!=NULL || isProtectedHost(targetHosts->value,handle->ihandle[i].url)==1){
+        char *token, *saveptr;
+        token = strtok_r (tmp, ",", &saveptr);
         while (token != NULL){
           int length=strlen(token)+6;
@@ -338 +338 @@
             AddMissingHeaderEntry(&handle->ihandle[i],token,tmpMap->value);
           }
-          free(tmp1);
           if(handle->ihandle[i].header!=NULL)
             curl_easy_setopt(handle->ihandle[i].handle,CURLOPT_HTTPHEADER,handle->ihandle[i].header);
+          free(tmp1);
           cnt+=1;
           token = strtok_r (NULL, ",", &saveptr);
@@ -520 +520 @@
     if(curl_multi_perform(hInternet->handle, &still_running)==CURLM_OK)
       if(still_running){
-        struct timespec tv;
-        tv.tv_sec = 0;
-        tv.tv_nsec = (long) 100;
-        nanosleep(&tv, &tv);
+        zSleep(10);
       }
   }while(still_running);