Subversion Repositories wimsdev

Rev

Rev 8185 | Rev 11173 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 8185 Rev 8849
Line 38... Line 38...
38 
    struct stat st;
 38 
    struct stat st;
39 
    int lim;
 39 
    int lim;
40 
 
 40 
 
41 
    if(fname[0] == 0) {
 41 
    if(fname[0] == 0) {
42 
abort:
 42 
abort:
43 
        llptr=llbuf; return;
 43 
      llptr=llbuf; return;
44 
    }
 44 
    }
45 
    if(llptr<=llbuf) goto abort;
 45 
    if(llptr<=llbuf) goto abort;
46 
    if(strstr(fname,"..")!=NULL) goto abort;
 46 
    if(strstr(fname,"..")!=NULL) goto abort;
47 
    for(pp=fname; *pp; pp++) if(*pp<'-' || *pp>'z' || strchr(":;=<>?\\^[]",*pp)!=NULL) goto abort;
 47 
    for(pp=fname; *pp; pp++) if(*pp<'-' || *pp>'z' || strchr(":;=<>?\\^[]",*pp)!=NULL) goto abort;
48 
    snprintf(namebuf,sizeof(namebuf),"%s/%s",logd,fname);
 48 
    snprintf(namebuf,sizeof(namebuf),"%s/%s",logd,fname);
49 
    pp=strrchr(namebuf,'/'); if(pp>namebuf+strlen(logd)) {
 49 
    pp=strrchr(namebuf,'/'); if(pp>namebuf+strlen(logd)) {
50 
        *pp=0; mkdirs(namebuf); *pp='/';
 50 
      *pp=0; mkdirs(namebuf); *pp='/';
51 
    }
 51 
    }
52 
    f=fopen(namebuf,"a"); if(f==NULL) goto abort;
 52 
    f=fopen(namebuf,"a"); if(f==NULL) goto abort;
53 
    l2=ftell(f);
 53 
    l2=ftell(f);
54 
    fwrite(llbuf,1,llptr-llbuf,f); l=ftell(f); fclose(f); llptr=llbuf;
 54 
    fwrite(llbuf,1,llptr-llbuf,f); l=ftell(f); fclose(f); llptr=llbuf;
55 
    if(l2==0) chmod(namebuf,S_IRUSR|S_IWUSR);
 55 
    if(l2==0) chmod(namebuf,S_IRUSR|S_IWUSR);
Line 57... Line 57...
57 
       strcmp(fname,"session.log")==0 || strcmp(fname,"post.log")==0 ||
 57 
       strcmp(fname,"session.log")==0 || strcmp(fname,"post.log")==0 ||
58 
       strcmp(fname,"user_error.log")==0 ||
 58 
       strcmp(fname,"user_error.log")==0 ||
59 
       strncmp(fname,"classes/",8)==0) lim=GEN_LOG_LIMIT;
 59 
       strncmp(fname,"classes/",8)==0) lim=GEN_LOG_LIMIT;
60 
    else lim=MODULE_LOG_LIMIT;
 60 
    else lim=MODULE_LOG_LIMIT;
61 
    if(l>=lim) {
 61 
    if(l>=lim) {
62 
        char b3[1024], b4[1024];
 62 
      char b3[1024], b4[1024];
63 
        int i;
 63 
      int i;
64 
        for(i=OLD_LOG_FILES-1;i>0;i--) {
 64 
      for(i=OLD_LOG_FILES-1;i>0;i--) {
65 
            snprintf(b3,sizeof(b3),"%s.old%d",namebuf,i);
 65 
          snprintf(b3,sizeof(b3),"%s.old%d",namebuf,i);
66 
            snprintf(b4,sizeof(b4),"%s.old%d",namebuf,i+1);
 66 
          snprintf(b4,sizeof(b4),"%s.old%d",namebuf,i+1);
67 
            if(stat(b3,&st)==0) rename(b3,b4);
 67 
          if(stat(b3,&st)==0) rename(b3,b4);
68 
        }
 68 
      }
69 
        if(OLD_LOG_FILES>0) {
 69 
      if(OLD_LOG_FILES>0) {
70 
            snprintf(b3,sizeof(b3),"%s.old1",namebuf);
 70 
          snprintf(b3,sizeof(b3),"%s.old1",namebuf);
71 
            rename(namebuf,b3);
 71 
          rename(namebuf,b3);
72 
        }
 72 
      }
73 
        else unlink(namebuf);
 73 
      else unlink(namebuf);
74 
    }
 74 
    }
75 
}
 75 
}
76 
 
 76 
 
77 
void dispatch_log(void)
 77 
void dispatch_log(void)
78 
{
 78 
{
Line 89... Line 89...
89 
    close(commsock);
 89 
    close(commsock);
90 
    call_sh(1,"for f in %s*; do mv $f $f.bb 2>/dev/null; done;\n\
 90 
    call_sh(1,"for f in %s*; do mv $f $f.bb 2>/dev/null; done;\n\
91 
sleep 1;\n\
 91 
sleep 1;\n\
92 
cat %s*.bb >%s 2>/dev/null;\n\
 92 
cat %s*.bb >%s 2>/dev/null;\n\
93 
rm -f %s*.bb",
 93 
rm -f %s*.bb",
94 
            TEMP_LOG_FILE+3,TEMP_LOG_FILE+3,TEMP_LOG_2,TEMP_LOG_FILE+3);
 94 
          TEMP_LOG_FILE+3,TEMP_LOG_FILE+3,TEMP_LOG_2,TEMP_LOG_FILE+3);
95 
    f=fopen(TEMP_LOG_2,"r"); if(f==NULL) exit(0);
 95 
    f=fopen(TEMP_LOG_2,"r"); if(f==NULL) exit(0);
96 
    fseek(f,0,SEEK_END); l=ftell(f); if(l<=0)
 96 
    fseek(f,0,SEEK_END); l=ftell(f); if(l<=0)
97 
        {fclose(f); unlink(TEMP_LOG_2); exit(0);}
 97 
      {fclose(f); unlink(TEMP_LOG_2); exit(0);}
98 
    logbuf=xmalloc(l+16); fseek(f,0,SEEK_SET);
 98 
    logbuf=xmalloc(l+16); fseek(f,0,SEEK_SET);
99 
    l2=fread(logbuf,1,l,f);fclose(f); unlink(TEMP_LOG_2);
 99 
    l2=fread(logbuf,1,l,f);fclose(f); unlink(TEMP_LOG_2);
100 
    if(l2!=l) {free(logbuf); exit(0);}
 100 
    if(l2!=l) {free(logbuf); exit(0);}
101 
    logbuf[l2]=0;
 101 
    logbuf[l2]=0;
102 
    for(loglinecnt=0,p1=logbuf;loglinecnt<MAX_LOGLINES && *p1;p1=p2) {
 102 
    for(loglinecnt=0,p1=logbuf;loglinecnt<MAX_LOGLINES && *p1;p1=p2) {
103 
        p2=strchr(p1,'\n'); if(p2) *p2++=0; else p2=p1+strlen(p1);
 103 
      p2=strchr(p1,'\n'); if(p2) *p2++=0; else p2=p1+strlen(p1);
104 
        p1=find_word_start(p1); if(*p1==0) continue;
 104 
      p1=find_word_start(p1); if(*p1==0) continue;
105 
        linetab[loglinecnt++]=p1;
 105 
      linetab[loglinecnt++]=p1;
106 
    }
 106 
    }
107 
    qsort(linetab,loglinecnt,sizeof(linetab[0]),llcmp);
 107 
    qsort(linetab,loglinecnt,sizeof(linetab[0]),llcmp);
108 
    namebuf[0]=0; llptr=llbuf;
 108 
    namebuf[0]=0; llptr=llbuf;
109 
    for(i=0;i<loglinecnt;i++) {
 109 
    for(i=0;i<loglinecnt;i++) {
110 
        p1=linetab[i]; p2=find_word_end(p1); *p2++=0;
 110 
      p1=linetab[i]; p2=find_word_end(p1); *p2++=0;
111 
        if(strcmp(namebuf,p1)!=0) {
 111 
      if(strcmp(namebuf,p1)!=0) {
112 
            onelogfile(namebuf); snprintf(namebuf,sizeof(namebuf),"%s",p1);
 112 
          onelogfile(namebuf); snprintf(namebuf,sizeof(namebuf),"%s",p1);
113 
        }
 113 
      }
114 
        if(strlen(p2)>=sizeof(llbuf)-(llptr-llbuf)-2) onelogfile(namebuf);
 114 
      if(strlen(p2)>=sizeof(llbuf)-(llptr-llbuf)-2) onelogfile(namebuf);
115 
        snprintf(llptr,sizeof(llbuf)-(llptr-llbuf),"%s\n",p2);
 115 
      snprintf(llptr,sizeof(llbuf)-(llptr-llbuf),"%s\n",p2);
116 
        llptr+=strlen(llptr);
 116 
      llptr+=strlen(llptr);
117 
    }
 117 
    }
118 
    if(namebuf[0]) onelogfile(namebuf);
 118 
    if(namebuf[0]) onelogfile(namebuf);
119 
    free(logbuf);
 119 
    free(logbuf);
120 
    exit(0);
 120 
    exit(0);
121 
}
 121 
}