File tree Expand file tree Collapse file tree 1 file changed +7
-15
lines changed
server/lib/classes/cron.d Expand file tree Collapse file tree 1 file changed +7
-15
lines changed Original file line number Diff line number Diff line change @@ -146,23 +146,15 @@ public function onRunJob() {
146146
147147 // delete logfiles after x days (default 30)
148148 if ($ log_retention > 0 ) {
149- $ month_ago = date ( ' Ymd ' , time () - 86400 * $ log_retention );
150- $ logfile = escapeshellcmd ( $ rec [ ' document_root ' ]. ' / ' . $ log_folder . ' / ' . $ month_ago . ' -access.log.gz ' );
151- if (@ is_file ($ logfile )) {
152- unlink ( $ logfile );
153- }
154- }
149+ foreach ( glob ( $ rec [ ' document_root ' ]. ' / ' . $ log_folder . ' / ' . " *.log* " ) as $ logfile ) {
150+ $ now = time ( );
151+ if ( is_file ($ logfile ))
152+ if ( $ now - filemtime ( $ logfile ) >= 60 * 60 * 24 * $ log_retention )
153+ unlink ( $ logfile );
154+ }
155155
156- //* Delete older Log files, in case that we missed them before due to serverdowntimes.
157- if ($ log_retention > 0 ) {
158- $ datepart = date ('Ym ' , time () - 86400 * $ log_retention +1 * 2 );
159-
160- $ logfile = escapeshellcmd ($ rec ['document_root ' ]).'/ ' . $ log_folder . '/ ' .$ datepart .'*-access.log.gz ' ;
161- exec ('rm -f ' .$ logfile );
156+ }
162157
163- $ logfile = escapeshellcmd ($ rec ['document_root ' ]).'/ ' . $ log_folder . '/ ' .$ datepart .'*-access.log ' ;
164- exec ('rm -f ' .$ logfile );
165- }
166158 }
167159
168160 //* Delete old logfiles in /var/log/ispconfig/httpd/ that were created by vlogger for the hostname of the server
You can’t perform that action at this time.
0 commit comments