@@ -45,16 +45,16 @@ int parse_cluster_cfg()

       while (*p!=' ' && *p!='\t' && *p!='[' && *p!=0)

 	 p++;

       if ( p==start || *p==0 ){

-	 SLOG(L_ERR,"ERROR: cluster names must only contain alphanumeric chars\n");

+	 LOG(L_ERR,"ERROR: cluster names must only contain alphanumeric chars\n");

 	 goto error;

       }

       if (!((*entry)=(struct as_entry*)shm_malloc(sizeof(struct as_entry)))) {

-	 SLOG(L_ERR,"Out of shm mem for as_entry\n");

+	 LOG(L_ERR,"Out of shm mem for as_entry\n");

 	 goto error;

       }

       memset(*entry,0,sizeof(struct as_entry));

       if (!((*entry)->name.s=shm_malloc(p-start))) {

-	 SLOG(L_ERR,"Out of shm malloc for cluster name\n");

+	 LOG(L_ERR,"Out of shm malloc for cluster name\n");

 	 goto error;

       }

       memcpy((*entry)->name.s, start, p-start);

@@ -65,7 +65,7 @@ int parse_cluster_cfg()

       /*get as names*/

       eat_spaces(p);

       if (*p!='['){

-	 SLOG(L_ERR,"Malformed cluster cfg string %s\n",cluster_cfg);

+	 LOG(L_ERR,"Malformed cluster cfg string %s\n",cluster_cfg);

 	 goto error;

       }

       p++;

@@ -79,14 +79,14 @@ int parse_cluster_cfg()

 	 if ( p==start || *p==0 )

 	    goto error;

 	 if (!((*entry)->u.cs.as_names[n].s=shm_malloc(p-start))) {

-	    SLOG(L_ERR,"Out of shm_mem for AS name in cluster\n");

+	    LOG(L_ERR,"Out of shm_mem for AS name in cluster\n");

 	    goto error;

 	 }

 	 (*entry)->u.cs.as_names[n].len=p-start;

 	 memcpy((*entry)->u.cs.as_names[n].s,start,p-start);

 	 n++;

 	 if(n>=MAX_AS_PER_CLUSTER){

-	    SLOG(L_ERR,"ERROR: too many AS per cluster\n");

+	    LOG(L_ERR,"ERROR: too many AS per cluster\n");

 	    goto error;

 	 }

 	 eat_spaces(p);

@@ -105,16 +105,16 @@ int parse_cluster_cfg()

       entry=&((*entry)->next);

    }

    for (tmp=as_list;tmp->next;tmp=tmp->next){

-      SLOG(L_DBG,"%.*s\n",tmp->name.len,tmp->name.s);

+      LOG(L_DBG,"%.*s\n",tmp->name.len,tmp->name.s);

    }

-   SLOG(L_DBG,"%.*s\n",tmp->name.len,tmp->name.s);

+   LOG(L_DBG,"%.*s\n",tmp->name.len,tmp->name.s);

    entry=&(tmp->next);

    for(tmp=as_list;tmp;tmp=tmp->next){

       if (tmp->type!=CLUSTER_TYPE) 

 	 continue;

-      SLOG(L_DBG,"cluster:[%.*s]\n",tmp->name.len,tmp->name.s);

+      LOG(L_DBG,"cluster:[%.*s]\n",tmp->name.len,tmp->name.s);

       for(k=0;k<tmp->u.cs.num;k++){

-	 SLOG(L_DBG,"\tAS:[%.*s]\n",tmp->u.cs.as_names[k].len,tmp->u.cs.as_names[k].s);

+	 LOG(L_DBG,"\tAS:[%.*s]\n",tmp->u.cs.as_names[k].len,tmp->u.cs.as_names[k].s);

 	 for (tmp2=as_list;tmp2;tmp2=tmp2->next) {

 	    if (tmp2->type== AS_TYPE && tmp->u.cs.as_names[k].len == tmp2->name.len && 

 		  !memcmp(tmp->u.cs.as_names[k].s,tmp2->name.s,tmp2->name.len)) {

@@ -125,13 +125,13 @@ int parse_cluster_cfg()

 	 if(tmp2)

 	    continue;

 	 if (!((*entry)=shm_malloc(sizeof(struct as_entry)))) {

-	    SLOG(L_ERR,"ERROR:Out of shm mem \n");

+	    LOG(L_ERR,"ERROR:Out of shm mem \n");

 	    goto error;

 	 }

 	 memset(*entry,0,sizeof(struct as_entry));

 	 (*entry)->type=AS_TYPE;

 	 if (!((*entry)->name.s=shm_malloc(tmp->u.cs.as_names[k].len))) {

-	    SLOG(L_ERR,"ERROR:out of shm mem\n");

+	    LOG(L_ERR,"ERROR:out of shm mem\n");

 	    goto error;

 	 }

 	 memcpy((*entry)->name.s,tmp->u.cs.as_names[k].s,tmp->u.cs.as_names[k].len);

@@ -142,7 +142,7 @@ int parse_cluster_cfg()

       }

    }

    for(tmp=as_list;tmp;tmp=tmp->next){

-      SLOG(L_DBG,"%.*s %s",tmp->name.len,tmp->name.s,tmp->next?"":"\n");

+      LOG(L_DBG,"%.*s %s",tmp->name.len,tmp->name.s,tmp->next?"":"\n");

    }

    return 1;

 error:

@@ -57,7 +57,7 @@ int encode_contact_body(char *hdr,int hdrlen,contact_body_t *contact_parsed,unsi

    }

    for(contact_offset=0,i=0,mycontact=contact_parsed->contacts;mycontact;mycontact=mycontact->next,i++){

       if((k=encode_contact(hdr,hdrlen,mycontact,&tmp[contact_offset]))<0){

-	 SLOG(L_ERR,"parsing contact number %d\n",i);

+	 LOG(L_ERR,"parsing contact number %d\n",i);

 	 return -1;

       }

       where[2+i]=k;

@@ -120,11 +120,11 @@ int encode_contact(char *hdrstart,int hdrlen,contact_t *body,unsigned char *wher

    }

    if (parse_uri(body->uri.s, body->uri.len,&puri) < 0 ) {

-      SLOG(L_ERR, "Bad URI in address\n");

+      LOG(L_ERR, "Bad URI in address\n");

       return -1;

    }else{

       if((j=encode_uri2(hdrstart,hdrlen,body->uri,&puri,&where[i]))<0){

-	 SLOG(L_ERR, "error codifying the URI\n");

+	 LOG(L_ERR, "error codifying the URI\n");

 	 return -1;

       }else{

 	 i+=j;

@@ -155,7 +155,7 @@ int print_encoded_contact_body(int fd,char *hdr,int hdrlen,unsigned char *payloa

    }

    numcontacts=payload[1];

    if(numcontacts==0){

-      SLOG(L_ERR,"no contacts present?\n");

+      LOG(L_ERR,"no contacts present?\n");

       return -1;

    }

    for(i=0,offset=2+numcontacts;i<numcontacts;i++){

@@ -225,7 +225,7 @@ int dump_contact_body_test(char *hdr,int hdrlen,unsigned char *payload,int payle

    }

    numcontacts=payload[1];

    if(numcontacts==0){

-      SLOG(L_ERR,"no contacts present?\n");

+      LOG(L_ERR,"no contacts present?\n");

       return -1;

    }

    if(segregationLevel & (JUNIT|SEGREGATE|ONLY_URIS)){

@@ -49,7 +49,7 @@ int encode_cseq(char *hdrstart,int hdrlen,struct cseq_body *body,unsigned char *

       i++;

    where[0]=i;

    if(str2int(&body->number,&cseqnum)<0){

-      SLOG(L_ERR,"str2int(cseq number)\n");

+      LOG(L_ERR,"str2int(cseq number)\n");

       return -1;

    }

    cseqnum=htonl(cseqnum);

@@ -84,11 +84,11 @@ int encode_digest(char *hdrstart,int hdrlen,dig_cred_t *digest,unsigned char *wh

       memset(&sipuri,0,sizeof(struct sip_uri));

       flags1|=HAS_URI_F;

       if (parse_uri(digest->uri.s, digest->uri.len,&sipuri) < 0 ) {

-	 SLOG(L_ERR, "Bad URI in address\n");

+	 LOG(L_ERR, "Bad URI in address\n");

 	 return -1;

       }else{

 	 if((j=encode_uri2(hdrstart,hdrlen,digest->uri,&sipuri,&where[i+1]))<0){

-	    SLOG(L_ERR, "Error encoding the URI\n");

+	    LOG(L_ERR, "Error encoding the URI\n");

 	    return -1;

 	 }else{

 	    where[i]=(unsigned char)j;

@@ -84,16 +84,16 @@ int encode_header(struct sip_msg *sipmsg,struct hdr_field *hdr,unsigned char *pa

    mlen=sipmsg->len;

    hdrstart = hdr->name.s;

    if(hdrstart-msg<0){

-      SLOG(L_ERR,"header(%.*s) does not belong to sip_msg(hdrstart<msg)\n",hdr->name.len,hdr->name.s);

+      LOG(L_ERR,"header(%.*s) does not belong to sip_msg(hdrstart<msg)\n",hdr->name.len,hdr->name.s);

       return -1;

    }

    ptr=htons((short int)(hdrstart-msg));

    if((hdrstart-msg)>mlen){

-      SLOG(L_ERR,"out of the sip_msg bounds (%d>%d)\n",ntohs(ptr),mlen);

+      LOG(L_ERR,"out of the sip_msg bounds (%d>%d)\n",ntohs(ptr),mlen);

       return -1;

    }

    if(hdr->len>(1<<16)){

-      SLOG(L_ERR,"length of header too long\n");

+      LOG(L_ERR,"length of header too long\n");

       return -1;

    }

    memcpy(payload,&ptr,2);

@@ -302,7 +302,7 @@ error:

       free_via_list(viabody);

    if(methods)

       pkg_free(methods);

-   SLOG(L_ERR,"%s",myerror);

+   LOG(L_ERR,"%s",myerror);

    return -1;

 }

@@ -195,7 +195,7 @@ int encode_msg(struct sip_msg *msg,char *payload,int len)

 	 (ms->u.reply.version.s-msg->buf));

    if(request){

       if (parse_uri(ms->u.request.uri.s,ms->u.request.uri.len, &miuri)<0){

-	 SLOG(L_ERR, "<%.*s>\n",ms->u.request.uri.len,ms->u.request.uri.s);

+	 LOG(L_ERR, "<%.*s>\n",ms->u.request.uri.len,ms->u.request.uri.s);

 	 myerror="while parsing the R-URI";

 	 goto error;

       }

@@ -224,7 +224,7 @@ int encode_msg(struct sip_msg *msg,char *payload,int len)

       memcpy(&payload[k+1],&h,2);

       /*TODO fix this... fixed with k-=3?*/

       if(0>(i=encode_header(msg,hf,(unsigned char*)(payload+j),MAX_ENCODED_MSG+MAX_MESSAGE_LEN-j))){

-	 SLOG(L_ERR,"encoding header %.*s\n",hf->name.len,hf->name.s);

+	 LOG(L_ERR,"encoding header %.*s\n",hf->name.len,hf->name.s);

 	 goto error;

 	 k-=3;

 	 continue;

@@ -248,13 +248,13 @@ int encode_msg(struct sip_msg *msg,char *payload,int len)

    /*pkg_free(payload2);*/

    /*now we copy the actual message after the headers-meta-section*/

    memcpy(&payload[j],msg->buf,msg->len);

-   SLOG(L_DBG,"msglen = %d,msg starts at %d\n",msg->len,j);

+   LOG(L_DBG,"msglen = %d,msg starts at %d\n",msg->len,j);

    j=htons(j);

    /*now we copy at the beginning, the index to where the actual message starts*/

    memcpy(&payload[MSG_START_IDX],&j,2);

    return GET_PAY_SIZE( payload );

 error:

-   SLOG(L_ERR,"%s\n",myerror);

+   LOG(L_ERR,"%s\n",myerror);

    return -1;

 }

@@ -276,7 +276,7 @@ int decode_msg(struct sip_msg *msg,char *code, unsigned int len)

       goto error;

    }

 error:

-   SLOG(L_ERR,"(%s)\n",myerror);

+   LOG(L_ERR,"(%s)\n",myerror);

    return -1;

 }

@@ -52,7 +52,7 @@ int encode_route_body(char *hdr,int hdrlen,rr_t *route_parsed,unsigned char *whe

    flags=0;

    for(route_offset=0,i=0,myroute=route_parsed;myroute;myroute=myroute->next,i++){

       if((k=encode_route(hdr,hdrlen,myroute,&tmp[route_offset]))<0){

-	 SLOG(L_ERR,"parsing route number %d\n",i);

+	 LOG(L_ERR,"parsing route number %d\n",i);

 	 return -1;

       }

       where[2+i]=(unsigned char)k;

@@ -88,11 +88,11 @@ int encode_route(char *hdrstart,int hdrlen,rr_t *body,unsigned char *where)

    }

    if (parse_uri(body->nameaddr.uri.s, body->nameaddr.uri.len,&puri) < 0 ) {

-      SLOG(L_ERR, "Bad URI in address\n");

+      LOG(L_ERR, "Bad URI in address\n");

       return -1;

    }else{

       if((j=encode_uri2(hdrstart,hdrlen,body->nameaddr.uri,&puri,&where[i]))<0){

-	 SLOG(L_ERR, "error codifying the URI\n");

+	 LOG(L_ERR, "error codifying the URI\n");

 	 return -1;

       }else{

 	 i+=j;

@@ -117,7 +117,7 @@ int print_encoded_route_body(int fd,char *hdr,int hdrlen,unsigned char *payload,

    numroutes=payload[1];

    if(numroutes==0){

-      SLOG(L_ERR,"no routes present?\n");

+      LOG(L_ERR,"no routes present?\n");

       return -1;

    }

    for(i=0,offset=2+numroutes;i<numroutes;i++){

@@ -169,7 +169,7 @@ int dump_route_body_test(char *hdr,int hdrlen,unsigned char *payload,int paylen,

    numroutes=payload[1];

    if(numroutes==0){

-      SLOG(L_ERR,"no routes present?\n");

+      LOG(L_ERR,"no routes present?\n");

       return -1;

    }

    if(segregationLevel & (JUNIT|SEGREGATE|ONLY_URIS)){

@@ -66,11 +66,11 @@ int encode_to_body(char *hdrstart,int hdrlen,struct to_body *body,unsigned char

       where[i++]=(unsigned char)body->tag_value.len;

    }

    if (parse_uri(body->uri.s, body->uri.len,&puri) < 0 ) {

-      SLOG(L_ERR, "Bad URI in address\n");

+      LOG(L_ERR, "Bad URI in address\n");

       return -1;

    }else{

       if((j=encode_uri2(hdrstart,hdrlen,body->uri,&puri,&where[i]))<0){

-	 SLOG(L_ERR, "error codifying the URI\n");

+	 LOG(L_ERR, "error codifying the URI\n");

 	 return -1;

       }else{

 	 i+=j;

@@ -101,7 +101,7 @@ int encode_uri2(char *hdr,int hdrlen,str uri_str, struct sip_uri *uri_parsed,uns

    uriptr=REL_PTR(hdr,uri_str.s);

    if(uri_str.len>255 || uriptr>hdrlen){

-      SLOG(L_ERR,"uri too long, or out of the sip_msg bounds\n");

+      LOG(L_ERR,"uri too long, or out of the sip_msg bounds\n");

       return -1;

    }

    payload[0]=uriptr;

@@ -56,7 +56,7 @@ int encode_via_body(char *hdr,int hdrlen,struct via_body *via_parsed,unsigned ch

    if(via_parsed)

       for(via_offset=0,i=0,myvia=via_parsed;myvia;myvia=myvia->next,i++){

 	 if((k=encode_via(hdr,hdrlen,myvia,&tmp[via_offset]))<0){

-	    SLOG(L_ERR,"parsing via number %d\n",i);

+	    LOG(L_ERR,"parsing via number %d\n",i);

 	    return -1;

 	 }

 	 where[2+i]=(unsigned char)k;

@@ -142,7 +142,7 @@ int print_encoded_via_body(int fd,char *hdr,int hdrlen,unsigned char *payload,in

    numvias=payload[1];

    dprintf(fd,"%s%d","NUMBER OF VIAS:",numvias);

    if(numvias==0){

-      SLOG(L_ERR,"no vias present?\n");

+      LOG(L_ERR,"no vias present?\n");

       return -1;

    }

    for(i=0,offset=2+numvias;i<numvias;i++){

@@ -217,7 +217,7 @@ int dump_via_body_test(char *hdr,int hdrlen,unsigned char *payload,int paylen,in

    numvias=payload[1];

    if(numvias==0){

-      SLOG(L_ERR,"no vias present?\n");

+      LOG(L_ERR,"no vias present?\n");

       return -1;

    }

    if(segregationLevel & SEGREGATE)

@@ -86,11 +86,11 @@ int dispatcher_main_loop()

    strcpy(whoami,"Seas Event Dispatcher process");

    /*I set process_no to -1 because otherwise, the logging process confuses this process with another from SER

-    * (see SLOG() and dprint() and my_pid())*/

+    * (see LOG() and dprint() and my_pid())*/

    process_no = -1;

    if(open_server_sockets(seas_listen_ip,seas_listen_port,socks)==-1){

-      SLOG(L_ERR,"unable to open server sockets on dispatcher\n");

+      LOG(L_ERR,"unable to open server sockets on dispatcher\n");

       return -1;

    }

    for(i=0;i<2;i++){

@@ -112,11 +112,11 @@ int dispatcher_main_loop()

       if(sig_flag==SIGCHLD){

 	 while ((chld=waitpid( -1, &chld_status, WNOHANG ))>0) {

 	    if (WIFEXITED(chld_status)){

-	       SLOG(L_INFO, "child process %d exited normally, status=%d\n",chld,WEXITSTATUS(chld_status));

+	       LOG(L_INFO, "child process %d exited normally, status=%d\n",chld,WEXITSTATUS(chld_status));

 	    }else if (WIFSIGNALED(chld_status)) {

-	       SLOG(L_INFO, "child process %d exited by a signal %d\n",chld,WTERMSIG(chld_status));

+	       LOG(L_INFO, "child process %d exited by a signal %d\n",chld,WTERMSIG(chld_status));

 	    }else if (WIFSTOPPED(chld_status)) 

-	       SLOG(L_INFO, "child process %d stopped by a signal %d\n",chld,WSTOPSIG(chld_status));

+	       LOG(L_INFO, "child process %d stopped by a signal %d\n",chld,WSTOPSIG(chld_status));

 	    for (as=as_list;as;as=as->next) {

 	       if(as->type!=AS_TYPE)

 		  continue;

@@ -124,7 +124,7 @@ int dispatcher_main_loop()

 		  for(i=0;i<as_nr && ((poll_fds[3+i].fd)!=(as->u.as.event_fd));i++)

 		     ;

 		  if(i==as_nr){

-		     SLOG(L_ERR,"Either the pinger has died or BUG found..\n");

+		     LOG(L_ERR,"Either the pinger has died or BUG found..\n");

 		     continue;

 		  }

 		  /*overwrite the obsolete 'i' position with the next position*/

@@ -144,17 +144,17 @@ int dispatcher_main_loop()

 		  destroy_pingtable(&as->u.as.jain_pings);

 		  destroy_pingtable(&as->u.as.servlet_pings);

 		  as_nr--;

-		  SLOG(L_WARN,"client [%.*s] leaving (Action Dispatcher Process died !)\n",as->name.len,as->name.s);

+		  LOG(L_WARN,"client [%.*s] leaving (Action Dispatcher Process died !)\n",as->name.len,as->name.s);

 		  break;

 	       }/*if(action_pid==chld)*/

 	    }/*for(as=as_list;as;as=as->next)*/

 	 }/*while(waitpid(-1)>0)*/

       }else if (sig_flag) {

-	 SLOG(L_WARN,"received signal != sigchld(%d)\n",sig_flag);

+	 LOG(L_WARN,"received signal != sigchld(%d)\n",sig_flag);

       }

       sig_flag=0;

       clean_index=0;

-      SLOG(L_INFO,"polling [2 ServSock] [1 pipe] [%d App Servers] [%d Uncomplete AS]\n",as_nr,unc_as_nr);

+      LOG(L_INFO,"polling [2 ServSock] [1 pipe] [%d App Servers] [%d Uncomplete AS]\n",as_nr,unc_as_nr);

       poll_events = poll(poll_fds,3+unc_as_nr+as_nr,-1);

       if (poll_events == -1) {

 	 if(errno==EINTR){

@@ -163,11 +163,11 @@ int dispatcher_main_loop()

 	    continue;

 	 }

 	 if(errno==EBADF){

-	    SLOG(L_ERR, "invalid file descriptor pased to poll (%s)\n",strerror(errno));

+	    LOG(L_ERR, "invalid file descriptor pased to poll (%s)\n",strerror(errno));

 	    return -1;/*??*/

 	 }

 	 /* errors */

-	 SLOG(L_ERR,"poll'ing:%s\n",strerror(errno));

+	 LOG(L_ERR,"poll'ing:%s\n",strerror(errno));

 	 poll_events=0;

 	 continue;

       } else if (poll_events == 0) {/*timeout*/

@@ -184,9 +184,9 @@ int dispatcher_main_loop()

 		  poll_tmp->fd=fd;

 		  poll_tmp->events=POLLIN|POLLHUP;

 		  unc_as_nr++;

-		  SLOG(L_DBG,"Have new %s client\n",i==0?"event":"action");

+		  LOG(L_DBG,"Have new %s client\n",i==0?"event":"action");

 	       }else{

-		  SLOG(L_ERR,"accepting connection from AS\n");

+		  LOG(L_ERR,"accepting connection from AS\n");

 	       }

 	    }

 	 }

@@ -195,36 +195,36 @@ int dispatcher_main_loop()

 	    poll_fds[2].revents &= (~POLLIN);

 	    poll_events--;

 	    if(dispatch_relay()<0){

-	       SLOG(L_ERR,"dispatch_relay returned -1"

+	       LOG(L_ERR,"dispatch_relay returned -1"

 		     "should clean-up table\n");

 	    }

 	 }

 	 /*now handle receive data from completed AS*/

 	 clean_index=0;

-	 SLOG(L_DBG,"Scanning data from %d AS\n",as_nr);

+	 LOG(L_DBG,"Scanning data from %d AS\n",as_nr);

 	 for(i=0;(i<as_nr) && poll_events;i++){

 	    clean_index=0;

 	    poll_tmp=&poll_fds[3+i];

 	    if(poll_tmp->revents)

 	       poll_events--;

 	    if(poll_tmp->revents & POLLIN){

-	       SLOG(L_DBG,"POLLIN found in AS #%i\n",i);

+	       LOG(L_DBG,"POLLIN found in AS #%i\n",i);

 	       poll_tmp->revents &= (~POLLIN);

 	       switch(handle_as_data(poll_tmp->fd)){

 		  case -2:/*read returned 0 bytes, an AS client is leaving*/

 		     clean_index=1;

 		     break;

 		  case -1:/*shouldnt happen*/

-		     SLOG(L_ERR,"reading from AS socket\n");

+		     LOG(L_ERR,"reading from AS socket\n");

 		     break;

 		  case 0:/* event_response received and processed*/

 		     break;

 		  default:

-		     SLOG(L_WARN,"unknown return type from handle_as_data\n");

+		     LOG(L_WARN,"unknown return type from handle_as_data\n");

 	       }

 	    }

 	    if(clean_index || (poll_tmp->revents & POLLHUP)){

-	       SLOG(L_DBG,"POLHUP or read==0 found in %i AS \n",i);

+	       LOG(L_DBG,"POLHUP or read==0 found in %i AS \n",i);

 	       clean_index=0;

 	       poll_tmp->revents = 0;

 	       for(as=as_list;as;as=as->next){

@@ -243,24 +243,24 @@ int dispatcher_main_loop()

 			poll_fds[j].revents=poll_fds[j+1].revents;

 		     }

 		     --i;

-		     SLOG(L_WARN,"client %.*s leaving !!!\n",as->name.len,as->name.s);

+		     LOG(L_WARN,"client %.*s leaving !!!\n",as->name.len,as->name.s);

 		     break;

 		  }

 	       }

 	       if (!as) {

-		  SLOG(L_ERR,"the leaving client was not found in the as_list\n");

+		  LOG(L_ERR,"the leaving client was not found in the as_list\n");

 	       }

 	    }

 	 }

 	 /*now handle data sent from uncompleted AS*/

-	 SLOG(L_DBG,"Scanning data from %d uncomplete AS \n",unc_as_nr);

+	 LOG(L_DBG,"Scanning data from %d uncomplete AS \n",unc_as_nr);

 	 clean_index=0;

 	 for(i=0;i<unc_as_nr && poll_events;i++){

 	    poll_tmp=&poll_fds[3+as_nr+i];

 	    if(poll_tmp->revents)

 	       poll_events--;

 	    if(poll_tmp->revents & POLLIN){

-	       SLOG(L_DBG,"POLLIN found in %d uncomplete AS \n",i);

+	       LOG(L_DBG,"POLLIN found in %d uncomplete AS \n",i);

 	       poll_tmp->revents &= (~POLLIN);

 	       fd=handle_unc_as_data(poll_tmp->fd);

 	       if(fd>0){

@@ -291,7 +291,7 @@ int dispatcher_main_loop()

 	       }

 	    }

 	    if(poll_tmp->revents & POLLHUP){

-	       SLOG(L_DBG,"POLLHUP found in %d uncomplete AS \n",i);

+	       LOG(L_DBG,"POLLHUP found in %d uncomplete AS \n",i);

 	       close(poll_tmp->fd);

 	       for(k=i;k<(unc_as_nr-1);k++){

 		  j=3+as_nr+k;

@@ -334,30 +334,30 @@ static int open_server_sockets(struct ip_addr *address,unsigned short port,int *

    fd[0]=fd[1]=-1;

    if(address->af!=AF_INET && address->af!=AF_INET6){

-      SLOG(L_ERR,"Only ip and ipv6 allowed socket types\n");

+      LOG(L_ERR,"Only ip and ipv6 allowed socket types\n");

       return -1;

    }

    for(i=0;i<2;i++){

       if(init_su(&su,address,port+i)<0){

-	 SLOG(L_ERR,"unable to init sockaddr_union\n");

+	 LOG(L_ERR,"unable to init sockaddr_union\n");

 	 return -1;

       }

       if((fd[i]=socket(AF2PF(su.s.sa_family), SOCK_STREAM, 0))==-1){

-	 SLOG(L_ERR,"trying to open server %s socket (%s)\n",i==0?"event":"action",strerror(errno));

+	 LOG(L_ERR,"trying to open server %s socket (%s)\n",i==0?"event":"action",strerror(errno));

 	 goto error;

       }

       optval=1;

       if (setsockopt(fd[i], SOL_SOCKET, SO_REUSEADDR, (void*)&optval, sizeof(optval))==-1) {

-	 SLOG(L_ERR,"setsockopt (%s)\n",strerror(errno));

+	 LOG(L_ERR,"setsockopt (%s)\n",strerror(errno));

 	 goto error;

       }

       if ((bind(fd[i], &su.s,sizeof(union sockaddr_union)))==-1){

-	 SLOG(L_ERR, "bind (%s)\n",strerror(errno));

+	 LOG(L_ERR, "bind (%s)\n",strerror(errno));

 	 goto error;

       }

       if (listen(fd[i], 10)==-1){

-	 SLOG(L_ERR, "listen (%s)\n",strerror(errno));

+	 LOG(L_ERR, "listen (%s)\n",strerror(errno));

 	 goto error;

       }

    }

@@ -402,13 +402,13 @@ read_again:

       if(errno==EINTR){

 	 goto read_again;

       }else{

-	 SLOG(L_ERR,"Dispatcher Process "

+	 LOG(L_ERR,"Dispatcher Process "

 	       "received unknown error reading from pipe (%s)\n",strerror(errno));

 	 retval=-1;

 	 goto error;

       }

    }else if(i==0){

-	 SLOG(L_ERR,"Dispatcher Process "

+	 LOG(L_ERR,"Dispatcher Process "

 	       "received 0 while reading from pipe\n");

 	 goto error;

    }else{

@@ -418,7 +418,7 @@ read_again:

    }

    if (!thepointer.ptr) {

-      SLOG(L_ERR,"Received Corrupted pointer to event !!\n");

+      LOG(L_ERR,"Received Corrupted pointer to event !!\n");

       retval=0;

       goto error;

    }

@@ -426,7 +426,7 @@ read_again:

    if(use_stats && thepointer.ptr->transaction)

       event_stat(thepointer.ptr->transaction);

    if(thepointer.ptr->as == NULL || !thepointer.ptr->as->connected || thepointer.ptr->as->type==CLUSTER_TYPE){

-      SLOG(L_WARN,"tryied to send an event to an App Server that is scheduled to die !!\n");

+      LOG(L_WARN,"tryied to send an event to an App Server that is scheduled to die !!\n");

       retval=-2;

       goto error;

    }

@@ -438,18 +438,18 @@ write_again:

       switch(errno){

 	 case EINTR:

 	    if(!thepointer.ptr->as->connected){

-	       SLOG(L_WARN,"tryied to send an event to an App Server that is scheduled to die !!\n");

+	       LOG(L_WARN,"tryied to send an event to an App Server that is scheduled to die !!\n");

 	       retval=-2;

 	       goto error;

 	    }

 	    goto write_again;

 	 case EPIPE:

-	    SLOG(L_ERR,"AS [%.*s] closed "

+	    LOG(L_ERR,"AS [%.*s] closed "

 		  "the socket !\n",thepointer.ptr->as->u.as.name.len,thepointer.ptr->as->u.as.name.s);

 	    retval=-2;

 	    goto error;

 	 default:

-	    SLOG(L_ERR,"unknown error while "

+	    LOG(L_ERR,"unknown error while "

 		  "trying to write to AS socket(%s)\n",strerror(errno));

 	    retval=-2;

 	    goto error;

@@ -460,12 +460,12 @@ write_again:

 	 goto write_again;

    }else if(i==0){

       if (tries++ > MAX_WRITE_TRIES) { 

-	 SLOG(L_ERR,"MAX WRITE TRIES !!!\n");

+	 LOG(L_ERR,"MAX WRITE TRIES !!!\n");

 	 goto error;

       }else

 	 goto write_again;

    }

-   SLOG(L_DBG,"Event relaied to %.*s AS\n",thepointer.ptr->as->u.as.name.len,thepointer.ptr->as->u.as.name.s);

+   LOG(L_DBG,"Event relaied to %.*s AS\n",thepointer.ptr->as->u.as.name.len,thepointer.ptr->as->u.as.name.s);

    LOG(L_DBG,"Event type %s \n",action_names[thepointer.ptr->type]);

    retval=0;

 error:

@@ -503,13 +503,13 @@ static inline int add_new_as(int event_idx,int action_idx,struct as_entry *as)

    if(use_ha){

       if(jain_ping_timeout){

 	 if (0>init_pingtable(&the_as->jain_pings,jain_ping_timeout,(jain_ping_timeout/jain_ping_period+1)*PING_OVER_FACTOR)){

-	    SLOG(L_ERR,"Unable to init jain pinging table...\n");

+	    LOG(L_ERR,"Unable to init jain pinging table...\n");

 	    goto error;

 	 }

       }

       if(servlet_ping_timeout){

 	 if (0>init_pingtable(&the_as->servlet_pings,servlet_ping_timeout,(servlet_ping_timeout/servlet_ping_period+1)*PING_OVER_FACTOR)){

-	    SLOG(L_ERR,"Unable to init servlet pinging table...\n");

+	    LOG(L_ERR,"Unable to init servlet pinging table...\n");

 	    goto error;

 	 }

       }

@@ -517,7 +517,7 @@ static inline int add_new_as(int event_idx,int action_idx,struct as_entry *as)

    /*TODO attention, this is pkg_malloc because only the Event_Dispatcher process 

     * has to use it !!*/

    if(!(the_as->ev_buffer.s = pkg_malloc(AS_BUF_SIZE))){

-      SLOG(L_ERR,"unable to alloc pkg mem for the event buffer\n");

+      LOG(L_ERR,"unable to alloc pkg mem for the event buffer\n");

       goto error;

    }

    the_as->ev_buffer.len=0;

@@ -530,7 +530,7 @@ static inline int add_new_as(int event_idx,int action_idx,struct as_entry *as)

 	 if (tmp->u.cs.as_names[j].len == the_as->name.len && 

 	       !memcmp(tmp->u.cs.as_names[j].s,the_as->name.s,the_as->name.len)) { 

 	    if(tmp->u.cs.num==tmp->u.cs.registered){

-	       SLOG(L_ERR,"AS %.*s belongs to cluster %.*s which is already completed\n",

+	       LOG(L_ERR,"AS %.*s belongs to cluster %.*s which is already completed\n",

 		     the_as->name.len,the_as->name.s,tmp->name.len,tmp->name.s);

 	       break;

 	    }

@@ -540,11 +540,11 @@ static inline int add_new_as(int event_idx,int action_idx,struct as_entry *as)

       }

    }

    if(0>spawn_action_dispatcher(as)){

-      SLOG(L_ERR,"Unable to spawn Action Dispatcher for as %s\n",ev->name);

+      LOG(L_ERR,"Unable to spawn Action Dispatcher for as %s\n",ev->name);

       goto error;

    }

    if(send_sockinfo(the_as->event_fd)==-1){

-      SLOG(L_ERR,"Unable to send socket info to as %s\n",ev->name);

+      LOG(L_ERR,"Unable to send socket info to as %s\n",ev->name);

       goto error;

    }

    return 0;

@@ -595,7 +595,7 @@ static inline int send_sockinfo(int fd)

    for(s=tls_listen;s;s=s->next,i++);

 #endif

    if(i==0){

-      SLOG(L_ERR,"no udp|tcp|tls sockets ?!!\n");

+      LOG(L_ERR,"no udp|tcp|tls sockets ?!!\n");

       return -1;

    }

    buffer[k++]=i;

@@ -648,7 +648,7 @@ static inline int print_sock_info(char *buffer,int wheremax,int *idx,struct sock

    k=*idx;

    buffer[k++]=(char)type;

    if((i=(unsigned char)s->name.len)>30){

-      SLOG(L_ERR,"name too long\n");

+      LOG(L_ERR,"name too long\n");

       return -1;

    }

    buffer[k++]=i;

@@ -684,23 +684,23 @@ static int handle_as_data(int fd)

       if(as->type == AS_TYPE && as->connected && (as->u.as.event_fd==fd))

 	 break;

    if(!as){

-      SLOG(L_ERR,"AS not found\n");

+      LOG(L_ERR,"AS not found\n");

       return -1;

    }

    k=AS_BUF_SIZE-(as->u.as.ev_buffer.len);

 again:

    if((j=read(fd,as->u.as.ev_buffer.s+as->u.as.ev_buffer.len,k))<0){

-      SLOG(L_ERR,"reading data for as %.*s\n",as->name.len,as->name.s);

+      LOG(L_ERR,"reading data for as %.*s\n",as->name.len,as->name.s);

       if(errno==EINTR)

 	 goto again;

       else

 	 return -1;

    }else if(j==0){

-      SLOG(L_ERR,"AS client leaving (%.*s)\n",as->name.len,as->name.s);

+      LOG(L_ERR,"AS client leaving (%.*s)\n",as->name.len,as->name.s);

       return -2;

    }

    as->u.as.ev_buffer.len+=j;

-   SLOG(L_DBG,"read %d bytes from AS (total = %d)\n",j,as->u.as.ev_buffer.len);

+   LOG(L_DBG,"read %d bytes from AS (total = %d)\n",j,as->u.as.ev_buffer.len);

    if(as->u.as.ev_buffer.len>5)

       process_event_reply(&as->u.as);

    return 0;

@@ -734,18 +734,18 @@ static int process_event_reply(as_p as)

    /*if ev_len > BUF_SIZE then a flag should be put on the AS so that the whole length

     * of the action is skipped, until a mechanism for handling big packets is implemented*/

    if(ev_len>AS_BUF_SIZE){

-      SLOG(L_WARN,"Packet too big (%d)!!! should be skipped and an error returned!\n",ev_len);

+      LOG(L_WARN,"Packet too big (%d)!!! should be skipped and an error returned!\n",ev_len);

       return -1;

    }

    if((as->ev_buffer.len<ev_len) || as->ev_buffer.len<4)

       return 0;

    switch(as->ev_buffer.s[4]){

       case BIND_AC:

-	 SLOG(L_DBG,"Processing a BIND action from AS (length=%d): %.*s\n",ev_len,as->name.len,as->name.s);

+	 LOG(L_DBG,"Processing a BIND action from AS (length=%d): %.*s\n",ev_len,as->name.len,as->name.s);

 	 process_bind_action(as,&as->ev_buffer.s[5],ev_len-5);

 	 break;

       case UNBIND_AC:

-	 SLOG(L_DBG,"Processing a UNBIND action from AS (length=%d): %.*s\n",ev_len,as->name.len,as->name.s);

+	 LOG(L_DBG,"Processing a UNBIND action from AS (length=%d): %.*s\n",ev_len,as->name.len,as->name.s);

 	 process_unbind_action(as,&as->ev_buffer.s[5],ev_len-5);

 	 break;

       default:

@@ -787,7 +787,7 @@ int process_bind_action(as_p as,char *payload,int len)

 	 break;

    }

    if(i==MAX_BINDS){

-      SLOG(L_ERR,"No more bindings allowed. Ignoring bind request for processor %d\n",processor_id);

+      LOG(L_ERR,"No more bindings allowed. Ignoring bind request for processor %d\n",processor_id);

       return -1;

    }

    memset(&my_addr,0,sizeof(struct ip_addr));

@@ -828,12 +828,12 @@ int process_bind_action(as_p as,char *payload,int len)

 	 as->binds[i]=si;

 	 as->bound_processor[i]=processor_id;

 	 as->num_binds++;

-	 SLOG(L_DBG,"AS processor with id: %d bound to %s %s %d\n",processor_id,proto_s,buffer,port);

+	 LOG(L_DBG,"AS processor with id: %d bound to %s %s %d\n",processor_id,proto_s,buffer,port);

 	 return 0;

       }

    }

 error:

-   SLOG(L_ERR,"Cannot bind to %s %s %d !!!\n",proto_s,buffer,port);

+   LOG(L_ERR,"Cannot bind to %s %s %d !!!\n",proto_s,buffer,port);

    return -1;

 }

@@ -856,12 +856,12 @@ int process_unbind_action(as_p as,char *payload,int len)

 	 break;

    }

    if(i==MAX_BINDS){

-      SLOG(L_ERR,"tried to unbind a processor which is not registered (id=%d)!\n",processor_id);

+      LOG(L_ERR,"tried to unbind a processor which is not registered (id=%d)!\n",processor_id);

       return 0;

    }

    as->bound_processor[i]=0;

    as->num_binds--;

-   SLOG(L_DBG,"AS processor un-bound with id: %d\n",processor_id);

+   LOG(L_DBG,"AS processor un-bound with id: %d\n",processor_id);

    return 0;

 }

@@ -884,23 +884,23 @@ static int handle_unc_as_data(int fd)

       if(unc_as_t[i].valid && unc_as_t[i].fd==fd)

 	 break;

    if(i==2*MAX_UNC_AS_NR){

-      SLOG(L_ERR,"has received an fd which is not in uncompleted AS array\n");

+      LOG(L_ERR,"has received an fd which is not in uncompleted AS array\n");

       return -1;

    }

    if(unc_as_t[i].flags & HAS_NAME){/*shouldn't happen, if it has a name, it shouldnt be in fdset[]*/

-      SLOG(L_WARN,"BUG this shouldn't happen\n");

+      LOG(L_WARN,"BUG this shouldn't happen\n");

       return 0;/*already have a name, please take me out the uncompleted AS array*/

    }

-   SLOG(L_DBG,"Reading client name\n");

+   LOG(L_DBG,"Reading client name\n");

    if(-1==(len=read_name(fd,unc_as_t[i].name,MAX_AS_NAME))){

       /*this guy should be disconnected, it sent an AS_NAME too long*/

-      SLOG(L_ERR,"Bad name passed from fd\n");

+      LOG(L_ERR,"Bad name passed from fd\n");

       unc_as_t[i].valid=0;

       unc_as_t[i].flags=0;

       return -2;

    }else if(len==-2){

-      SLOG(L_WARN,"client disconnected\n");

+      LOG(L_WARN,"client disconnected\n");

       return -2;

    }

    name1=unc_as_t[i].name;

@@ -909,7 +909,7 @@ static int handle_unc_as_data(int fd)

    for(as=as_list;as;as=as->next){

       if(as->name.len==len && !memcmp(name1,as->name.s,len)){

 	 if(as->connected){

-	    SLOG(L_WARN,"AppServer trying to connect with a name already taken (%.*s)\n",len,name1);

+	    LOG(L_WARN,"AppServer trying to connect with a name already taken (%.*s)\n",len,name1);

 	    unc_as_t[i].valid=0;

 	    unc_as_t[i].flags=0;

 	    return -2;

@@ -918,7 +918,7 @@ static int handle_unc_as_data(int fd)

       }

    }

    if (!as) {

-      SLOG(L_ERR,"a client tried to connect which is not declared in config. script(%.*s)\n",len,name1);

+      LOG(L_ERR,"a client tried to connect which is not declared in config. script(%.*s)\n",len,name1);

       unc_as_t[i].valid=0;

       unc_as_t[i].flags=0;

       return -2;

@@ -933,10 +933,10 @@ static int handle_unc_as_data(int fd)

 	    (unc_as_t[j].flags & HAS_NAME) && 

 	    !strcmp(unc_as_t[i].name,unc_as_t[j].name))

 	 break;

-   SLOG(L_INFO,"Fantastic, we have a new client: %s\n",unc_as_t[i].name);

+   LOG(L_INFO,"Fantastic, we have a new client: %s\n",unc_as_t[i].name);

    if(j==k)/* the unc_as peer's socket hasn't been found, just take this one out of fdset because it already has its name */

       return 0;/*take me out from fdset[]*/

-   SLOG(L_INFO,"EUREKA, we have a new completed AS: %s\n",unc_as_t[i].name);

+   LOG(L_INFO,"EUREKA, we have a new completed AS: %s\n",unc_as_t[i].name);

    /* EUREKA ! we have a sweet pair of AS sockets, with the same name !!*/

    if(add_new_as(i<j?i:j,i<j?j:i,as)==-1){

       close(unc_as_t[j].fd);

@@ -964,15 +964,15 @@ try_again1:

       if(errno==EINTR)

 	 goto try_again1;

       else{

-	 SLOG(L_ERR,"trying to read length from fd=%d (%s)\n",sock,strerror(errno));

+	 LOG(L_ERR,"trying to read length from fd=%d (%s)\n",sock,strerror(errno));

 	 return -1;

       }

    }else if(n==0){

-      SLOG(L_WARN,"uncomplete AS has disconnected before giving its name\n");

+      LOG(L_WARN,"uncomplete AS has disconnected before giving its name\n");

       return -2;

    }

    if(namelen>dstlen || namelen==0){

-      SLOG(L_ERR,"name too long to fit in dst (%d > %d)\n",namelen,dstlen);

+      LOG(L_ERR,"name too long to fit in dst (%d > %d)\n",namelen,dstlen);

       return -1;

    }

 try_again2:

@@ -980,11 +980,11 @@ try_again2:

       if(errno==EINTR)

 	 goto try_again2;

       else{

-	 SLOG(L_ERR,"trying to read %d chars into %p from fd=%d (%s)\n",namelen,dst,sock,strerror(errno));

+	 LOG(L_ERR,"trying to read %d chars into %p from fd=%d (%s)\n",namelen,dst,sock,strerror(errno));

 	 return -1;

       }

    }else if(n==0){

-      SLOG(L_WARN,"uncomplete AS has disconnected before giving its name\n");

+      LOG(L_WARN,"uncomplete AS has disconnected before giving its name\n");

       return -2;

    }

    dst[namelen]=0;

@@ -1018,7 +1018,7 @@ again:

       if(errno==EINTR){

 	 goto again;

       }else{

-	 SLOG(L_ERR,"error while accepting connection: %s\n", strerror(errno));

+	 LOG(L_ERR,"error while accepting connection: %s\n", strerror(errno));

 	 return -1;

       }

    }

@@ -1026,7 +1026,7 @@ again:

       case 'e':

 	 for(i=0;i<MAX_UNC_AS_NR && unc_as_t[i].valid;i++);

 	 if(i==MAX_UNC_AS_NR){

-	    SLOG(L_WARN,"no more uncomplete connections allowed\n");

+	    LOG(L_WARN,"no more uncomplete connections allowed\n");

 	    goto error;

 	 }

 	 unc_as_t[i].fd=sock;

@@ -1037,7 +1037,7 @@ again:

       case 'a':

 	 for(i=MAX_UNC_AS_NR;(i<(2*MAX_UNC_AS_NR)) && unc_as_t[i].valid;i++);

 	 if(i==2*MAX_UNC_AS_NR){

-	    SLOG(L_WARN,"no more uncomplete connections allowed\n");

+	    LOG(L_WARN,"no more uncomplete connections allowed\n");

 	    goto error;

 	 }

 	 unc_as_t[i].fd=sock;

@@ -1050,7 +1050,7 @@ again:

    }

    flags=1;

    if ((setsockopt(sock, IPPROTO_TCP , TCP_NODELAY,&flags, sizeof(flags))<0) ){

-      SLOG(L_WARN, "could not disable Nagle: %s\n",

+      LOG(L_WARN, "could not disable Nagle: %s\n",

 	    strerror(errno));

    }

@@ -1066,7 +1066,7 @@ int spawn_action_dispatcher(struct as_entry *the_as)

    pid_t pid;

    pid=fork();

    if(pid<0){

-      SLOG(L_ERR,"unable to fork an action dispatcher for %.*s\n",the_as->name.len,the_as->name.s);

+      LOG(L_ERR,"unable to fork an action dispatcher for %.*s\n",the_as->name.len,the_as->name.s);

       return -1;

    }

    if(pid==0){/*child*/