From a7ee2993f02fb45f704c92ffdc49f840e05f5bd0 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Mon, 17 Oct 2011 11:32:50 +0200 Subject: [PATCH] 7042 Improving cleanup_database.pl: handling quotes in a_session and interpreting sessdays parameter Improving the cleanup_database.pl script in two aspects: 1) In some cases CGI::Session seems to place quotes around the atime and ctime data in the a_session field. Two regexps now take this into account. 2) If the --sessdays parameter is used, the --sessions parameter is now implicitly enabled too. With thanks to Ian Bays and Tom Hanstra. Signed-off-by: Ian Bays Signed-off-by: Ian Walls Signed-off-by: Chris Cormack --- misc/cronjobs/cleanup_database.pl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/misc/cronjobs/cleanup_database.pl b/misc/cronjobs/cleanup_database.pl index 2b0cf9028e..12aa12b5c7 100755 --- a/misc/cronjobs/cleanup_database.pl +++ b/misc/cronjobs/cleanup_database.pl @@ -44,7 +44,7 @@ Usage: $0 [-h|--help] [--sessions] [--sessdays DAYS] [-v|--verbose] [--zebraqueu other options --sessions purge the sessions table. If you use this while users are logged into Koha, they will have to reconnect. - --sessdays DAYS purge only sessions older than DAYS days (use together with sessions parameter). + --sessdays DAYS purge only sessions older than DAYS days. -v --verbose will cause the script to give you a bit more information about the run. --zebraqueue DAYS purge completed entries from the zebraqueue from @@ -66,6 +66,7 @@ GetOptions( 'zebraqueue:i' => \$zebraqueue_days, 'merged' => \$purge_merged, ) || usage(1); +$sessions=1 if $sess_days && $sess_days>0; if ($help) { usage(0); @@ -158,9 +159,9 @@ sub RemoveOldSessions { while ( $sth->fetch ) { $lasttime = 0; - if ( $a_session =~ /lasttime:\s+(\d+)/ ) { + if ( $a_session =~ /lasttime:\s+'?(\d+)/ ) { $lasttime = $1; - } elsif ( $a_session =~ /(ATIME|CTIME):\s+(\d+)/ ) { + } elsif ( $a_session =~ /(ATIME|CTIME):\s+'?(\d+)/ ) { $lasttime = $2; } if ( $lasttime && $lasttime < $limit ) { -- 2.39.5