diff options
| author | Daniel Friesel <derf@finalrewind.org> | 2019-04-24 08:45:56 +0200 |
|---|---|---|
| committer | Daniel Friesel <derf@finalrewind.org> | 2019-04-24 08:45:56 +0200 |
| commit | fd314e327d9926da00a433c8192d592334662ba5 (patch) | |
| tree | 0e84ca82b396d96295cdfe42b59acbb7b2ead518 | |
| parent | 14d2dd52eb11ccdaca648227e185cf06c2940e09 (diff) | |
maintenance, munin: Use journeys, not user_actions0.15
| -rw-r--r-- | lib/Travelynx/Command/maintenance.pm | 15 | ||||
| -rw-r--r-- | lib/Travelynx/Command/munin.pm | 2 |
2 files changed, 9 insertions, 8 deletions
diff --git a/lib/Travelynx/Command/maintenance.pm b/lib/Travelynx/Command/maintenance.pm index 0651a83..3b2462c 100644 --- a/lib/Travelynx/Command/maintenance.pm +++ b/lib/Travelynx/Command/maintenance.pm @@ -77,13 +77,14 @@ sub run { for my $uid (@uids_to_delete) { say "Deleting uid ${uid}..."; - my $tokens_res = $db->delete( 'tokens', { user_id => $uid } ); - my $stats_res = $db->delete( 'journey_stats', { user_id => $uid } ); - my $actions_res = $db->delete( 'user_actions', { user_id => $uid } ); - my $user_res = $db->delete( 'users', { id => $uid } ); - - printf( " %d tokens, %d monthly stats, %d actions\n", - $tokens_res->rows, $stats_res->rows, $actions_res->rows ); + my $tokens_res = $db->delete( 'tokens', { user_id => $uid } ); + my $stats_res = $db->delete( 'journey_stats', { user_id => $uid } ); + my $journeys_res = $db->delete( 'journeys', { user_id => $uid } ); + my $transit_res = $db->delete( 'in_transit', { user_id => $uid } ); + my $user_res = $db->delete( 'users', { id => $uid } ); + + printf( " %d tokens, %d monthly stats, %d journeys\n", + $tokens_res->rows, $stats_res->rows, $journeys_res->rows ); if ( $user_res->rows != 1 ) { printf STDERR ( diff --git a/lib/Travelynx/Command/munin.pm b/lib/Travelynx/Command/munin.pm index 225a281..a7ee9b1 100644 --- a/lib/Travelynx/Command/munin.pm +++ b/lib/Travelynx/Command/munin.pm @@ -23,7 +23,7 @@ sub run { my $now = DateTime->now( time_zone => 'Europe/Berlin' ); my $checkin_window_query - = qq{select count(*) as count from user_actions where action_id = 1 and action_time > to_timestamp(?);}; + = qq{select count(*) as count from journeys where checkin_time > to_timestamp(?);}; query_to_munin( 'reg_user_count', $db->select( 'users', 'count(*) as count', { status => 1 } ) |