From 416de0cea958bd1109201d607bac5c6fad9673ab Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Mon, 10 Feb 2025 23:22:48 +0200 Subject: syslog for foo --- frontends/scripts/fooodds.txt | 23 +++++++++++++++++++++++ frontends/scripts/foostats.pl | 22 +++++++++++----------- frontends/scripts/odds.txt | 16 ---------------- 3 files changed, 34 insertions(+), 27 deletions(-) create mode 100644 frontends/scripts/fooodds.txt delete mode 100644 frontends/scripts/odds.txt (limited to 'frontends/scripts') diff --git a/frontends/scripts/fooodds.txt b/frontends/scripts/fooodds.txt new file mode 100644 index 0000000..3fee942 --- /dev/null +++ b/frontends/scripts/fooodds.txt @@ -0,0 +1,23 @@ +% ++ +.. +/admin +.asp +.env +.git +HNAP1 +.lua +microsoft.exchange +/owa/ +.php +robots.txt +wordpress +/wp +.rar +/config.json +/sitemap.xml +/actuator/health +/portal/redlion +/SDK +/bin/sh +.js diff --git a/frontends/scripts/foostats.pl b/frontends/scripts/foostats.pl index 353a50c..dacf733 100644 --- a/frontends/scripts/foostats.pl +++ b/frontends/scripts/foostats.pl @@ -249,8 +249,8 @@ package Foostats::Logreader { }; } - sub parse_logs ( $last_web_date, $last_gemini_date, $odds_file, $filter_log ) { - my $agg = Foostats::Aggregator->new( $odds_file, $filter_log ); + sub parse_logs ( $last_web_date, $last_gemini_date, $odds_file, $odds_log ) { + my $agg = Foostats::Aggregator->new( $odds_file, $odds_log ); say "Last web date: $last_web_date"; say "Last gemini date: $last_gemini_date"; @@ -358,9 +358,9 @@ package Foostats::Aggregator { GEMFEED_URI_2 => '/gemfeed/', }; - sub new ( $class, $odds_file, $filter_log ) { + sub new ( $class, $odds_file, $odds_log ) { bless { - filter => Foostats::Filter->new( $odds_file, $filter_log ), + filter => Foostats::Filter->new( $odds_file, $odds_log ), stats => {} }, $class; @@ -689,13 +689,13 @@ package main { use Getopt::Long; use Sys::Hostname; - sub parse_logs ( $stats_dir, $odds_file, $filter_log ) { + sub parse_logs ( $stats_dir, $odds_file, $odds_log ) { my $out = Foostats::FileOutputter->new( stats_dir => $stats_dir ); $out->{stats} = Foostats::Logreader::parse_logs( $out->last_processed_date('web'), $out->last_processed_date('gemini'), - $odds_file, $filter_log + $odds_file, $odds_log ); $out->write; @@ -704,9 +704,9 @@ package main { my ( $parse_logs, $replicate, $report, $all ); # With default values - my $stats_dir = '/var/www/htdocs/buetow.org/self/foostats'; - my $odds_file = $stats_dir . '/odds.txt'; - my $filter_log = '/var/log/foofilter'; + my $stats_dir = '/var/www/htdocs/buetow.org/self/foostats'; + my $odds_file = $stats_dir . '/fooodds.txt'; + my $odds_log = '/var/log/fooodds'; my $partner_node = hostname eq 'fishfinger.buetow.org' ? 'blowfish.buetow.org' @@ -715,7 +715,7 @@ package main { # TODO: Add help output GetOptions 'parse-logs!' => \$parse_logs, - 'filter-log=s' => \$filter_log, + 'filter-log=s' => \$odds_log, 'odds-file=s' => \$odds_file, 'replicate!' => \$replicate, 'report!' => \$report, @@ -723,7 +723,7 @@ package main { 'stats-dir=s' => \$stats_dir, 'partner-node=s' => \$partner_node; - parse_logs( $stats_dir, $odds_file, $filter_log ) + parse_logs( $stats_dir, $odds_file, $odds_log ) if $parse_logs or $all; diff --git a/frontends/scripts/odds.txt b/frontends/scripts/odds.txt deleted file mode 100644 index 489b2e0..0000000 --- a/frontends/scripts/odds.txt +++ /dev/null @@ -1,16 +0,0 @@ -% -+ -.. -/admin -.asp -.env -.git -HNAP1 -.lua -microsoft.exchange -/owa/ -.php -robots.txt -wordpress -/wp -.rar -- cgit v1.2.3