diff --git a/install/tpl/apache_ispconfig.conf.master b/install/tpl/apache_ispconfig.conf.master index fe9e54a0c5ff36bc5340d437beb5b55acfcd571e..aaa9e0dd94d372821345b0d88467900eb2710449 100644 --- a/install/tpl/apache_ispconfig.conf.master +++ b/install/tpl/apache_ispconfig.conf.master @@ -5,7 +5,7 @@ ################################################ LogFormat "%v %h %l %u %t \"%r\" %>s %B \"%{Referer}i\" \"%{User-Agent}i\"" combined_ispconfig -CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m%d-access.log\" -d \"/etc/vlogger-dbi.conf\" /var/log/ispconfig/httpd" combined_ispconfig +CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m%d-access.log\" /var/log/ispconfig/httpd" combined_ispconfig AllowOverride None diff --git a/server/conf/apache_ispconfig.conf.master b/server/conf/apache_ispconfig.conf.master index 1c0d367ce43e3e6700428ec772e0a29786415137..b6ac8c3c28e4c8ce2027ee1275a4b90a6c9ce1b1 100644 --- a/server/conf/apache_ispconfig.conf.master +++ b/server/conf/apache_ispconfig.conf.master @@ -4,7 +4,7 @@ ################################################ LogFormat "%v %h %l %u %t \"%r\" %>s %B \"%{Referer}i\" \"%{User-Agent}i\"" combined_ispconfig -CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m%d-access.log\" -d \"/etc/vlogger-dbi.conf\" /var/log/ispconfig/httpd" combined_ispconfig +CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m%d-access.log\" /var/log/ispconfig/httpd" combined_ispconfig AllowOverride None diff --git a/server/cron_daily.php b/server/cron_daily.php index 0a3d90df5b769225c7dfe36c3621c7dd3c9a17e4..58019f58680ba29b69afa1865dc9b8b7091c34ea 100644 --- a/server/cron_daily.php +++ b/server/cron_daily.php @@ -260,14 +260,46 @@ HostAliases="www.'.$domain.' localhost 127.0.0.1'.$aliasdomain.'"'; exec('chmod +r /var/log/ispconfig/httpd/*'); ####################################################################################################### -// Manage and compress web logfiles +// Manage and compress web logfiles and create traffic statistics ####################################################################################################### $sql = "SELECT domain_id, domain, document_root FROM web_domain WHERE server_id = ".$conf['server_id']; $records = $app->db->queryAllRecords($sql); foreach($records as $rec) { - $yesterday = date('Ymd',time() - 86400*2); - $logfile = escapeshellcmd($rec['document_root'].'/log/'.$yesterday.'-access.log'); + + //* create traffic statistics based on yesterdays access log file + $yesterday = date('Ymd',time() - 86400); + $logfile = $rec['document_root'].'/log/'.$yesterday.'-access.log'; + $total_bytes = 0; + + $handle = @fopen($logfile, "r"); + if ($handle) { + while (($line = fgets($handle, 4096)) !== false) { + if (preg_match('/^\S+ \S+ \S+ \[.*?\] "\S+.*?" \d+ (\d+) ".*?" ".*?"/', $line, $m)) { + $total_bytes += intval($m[1]); + } + } + + //* Insert / update traffic in master database + $traffic_date = date('Y-m-d',time() - 86400); + $tmp = $app->dbmaster->queryOneRecord("select hostname from web_traffic where hostname='".$rec['domain']."' and traffic_date='".$traffic_date."'"); + if(is_array($tmp) && count($tmp) > 0) { + $sql = "update web_traffic set traffic_bytes=traffic_bytes+" + . $total_bytes + . " where hostname='" . $rec['domain'] + . "' and traffic_date='" . $traffic_date . "'"; + } else { + $sql = "insert into web_traffic (hostname, traffic_date, traffic_bytes) values ('".$rec['domain']."', '".$traffic_date."', '".$total_bytes."')"; + } + $app->dbmaster->query($sql); + + fclose($handle); + } + + $yesterday2 = date('Ymd',time() - 86400*2); + $logfile = escapeshellcmd($rec['document_root'].'/log/'.$yesterday2.'-access.log'); + + //* Compress logfile if(@is_file($logfile)) { // Compress yesterdays logfile exec("gzip -c $logfile > $logfile.gz");