Original release 20150826

[fex.git] / bin / logwatch

diff --git a/bin/logwatch b/bin/logwatch
index 7ef1d4ba25a1ea04c425f3d5a956e037e036b0a6..733673ce2d6b99abd586737a51706cf5893033b7 100755 (executable)
--- a/bin/logwatch
+++ b/bin/logwatch
@@ -1,6 +1,5 @@
 #!/usr/bin/perl -w
 
 #!/usr/bin/perl -w
 

-use Encode;

 use File::Basename;
 use Cwd 'abs_path';
 use I18N::Langinfo qw'langinfo CODESET';
 use File::Basename;
 use Cwd 'abs_path';
 use I18N::Langinfo qw'langinfo CODESET';


@@ -19,7 +18,7 @@ unless ($FEXLIB = $ENV{FEXLIB}) {
 die "$0: no $FEXLIB\n" unless -d $FEXLIB;
 
 # import from fex.pp
 die "$0: no $FEXLIB\n" unless -d $FEXLIB;
 
 # import from fex.pp

-our ($logdir,$spooldir,$debug);
+our (@logdir,$spooldir,$debug);

 
 # load common code, local config : $HOME/lib/fex.ph
 require "$FEXLIB/fex.pp" or die "$0: cannot load $FEXLIB/fex.pp - $!\n";
 
 # load common code, local config : $HOME/lib/fex.ph
 require "$FEXLIB/fex.pp" or die "$0: cannot load $FEXLIB/fex.pp - $!\n";


@@ -27,7 +26,7 @@ require "$FEXLIB/fex.pp" or die "$0: cannot load $FEXLIB/fex.pp - $!\n";
 $CTYPE = langinfo(CODESET());
 binmode(STDOUT,":encoding($CTYPE)");
 
 $CTYPE = langinfo(CODESET());
 binmode(STDOUT,":encoding($CTYPE)");
 

-$log = shift || "$logdir/fexsrv.log";
+$log = shift || $logdir[0].'/fexsrv.log';

 
 $ignore = join('|',qw(
   (CONNECT|CONTINUE).*(crawl|msnbot|obertux)
 
 $ignore = join('|',qw(
   (CONNECT|CONTINUE).*(crawl|msnbot|obertux)


@@ -40,9 +39,9 @@ $ignore = join('|',qw(
   GET./fup\?showstatus
   GET./FAQ/faq\.css
   GET./FAQ/jquery\.js
   GET./fup\?showstatus
   GET./FAQ/faq\.css
   GET./FAQ/jquery\.js

-  GET./10+.B

   GET.*Arrow\.gif
   GET./apple-touch
   GET.*Arrow\.gif
   GET./apple-touch

+  GET./browserconfig\.xml

   User-Agent:.*(Webnote|FeedFetcher|\w+bot|bot/|Website.Watcher|crawler|spider|searchme|Yandex|Slurp|ScoutJet|findlinks|urlmon|nagios)
   User-Agent:.fnb.*quak
   From:.*(msnbot|yandex|googlebot|webcrawler)
   User-Agent:.*(Webnote|FeedFetcher|\w+bot|bot/|Website.Watcher|crawler|spider|searchme|Yandex|Slurp|ScoutJet|findlinks|urlmon|nagios)
   User-Agent:.fnb.*quak
   From:.*(msnbot|yandex|googlebot|webcrawler)


@@ -88,6 +87,7 @@ $ignore = join('|',qw(
   x-Mobile
   X-Country
   X-ClickOnceSupport
   x-Mobile
   X-Country
   X-ClickOnceSupport

+  X-Newrelic

   .*:\s*$
 );
 
   .*:\s*$
 );
 


@@ -132,7 +132,7 @@ for (;;) {
       printf "  TO=\"%s\"\n",$to;
       $cgi = '';
       if ($comment = slurp("$ddir/comment")) {
       printf "  TO=\"%s\"\n",$to;
       $cgi = '';
       if ($comment = slurp("$ddir/comment")) {

-        printf "  COMMENT=\"%s\"\n",decode_utf8($comment,0)||'';
+        printf "  COMMENT=\"%s\"\n",utf8decode($comment)||'';

       }
       if (not -f "$ddir/data" and $_ = slurp("$ddir/error")) {
         s/\n.*//s;
       }
       if (not -f "$ddir/data" and $_ = slurp("$ddir/error")) {
         s/\n.*//s;


@@ -146,12 +146,12 @@ for (;;) {
       read_skey($1);
       print "\n";
     }
       read_skey($1);
       print "\n";
     }

+    if ($debug and $pid and $cgi) {
+      &read_debug_log;
+    };
+    $pid = $cgi = '';

   }
   sleep 1;
   }
   sleep 1;

-  if ($debug and $pid and $cgi) {
-    &read_debug_log;
-    $pid = $cgi = '';
-  };

 }
 
 
 }
 
 


@@ -164,7 +164,7 @@ sub read_debug_log {
 
   for (1..2) {
     sleep 1;
 
   for (1..2) {
     sleep 1;

-    @log = `ls -rt $logdir/.debug/*_${pid}.$cgi 2>/dev/null`;
+    @log = `ls -rt $logdir[0]/.debug/*_${pid}.$cgi 2>/dev/null`;

     if ($log = $log[-1] and open $log,$log) {
       # binmode($log,":encoding(UTF-8)");
       while (<$log>) {
     if ($log = $log[-1] and open $log,$log) {
       # binmode($log,":encoding(UTF-8)");
       while (<$log>) {


@@ -176,7 +176,7 @@ sub read_debug_log {
           $_ = <$log>;
           my $v = <$log>||'';
           $v =~ s/[\r\n]+//;
           $_ = <$log>;
           my $v = <$log>||'';
           $v =~ s/[\r\n]+//;

-          printf "  %s=\"%s\"\n",$p,decode_utf8($v,0)||$v if $v;
+          printf "  %s=\"%s\"\n",$p,utf8decode($v)||$v if $v;

           read_akey($v) if $p eq 'AKEY';
           read_skey($v) if $p eq 'SKEY';
         } elsif (/^(Param|Exp): (\w+=".+")/) {
           read_akey($v) if $p eq 'AKEY';
           read_skey($v) if $p eq 'SKEY';
         } elsif (/^(Param|Exp): (\w+=".+")/) {


@@ -209,3 +209,10 @@ sub read_skey {
     close $skey;
   }
 }
     close $skey;
   }
 }

+
+
+sub utf8decode {
+  local $_ = shift;
+  s/([\xC0-\xDF])([\x80-\xBF])/chr(ord($1)<<6&0xC0|ord($2)&0x3F)/eg;
+  return $_;
+}