|
5 | 5 | # Invoke with -y or --yesterday to compile with yesterday's timestamps.
|
6 | 6 | # Useful if you run this script overnight starting after 12AM.
|
7 | 7 |
|
8 |
| -# Author: Peter Bailie, RPI Research Computing |
9 |
| -# Date: April 29, 2022 |
| 8 | +# Author: Peter Bailie, RPI Research Computing |
| 9 | +# Date: April 29, 2022 |
| 10 | +# Updated: February 7, 2023 |
10 | 11 |
|
11 | 12 | use strict;
|
12 | 13 | use warnings;
|
|
28 | 29 | open my $psql_fh, "<:encoding(UTF-8)", $PSQL_LOG;
|
29 | 30 | open my $pnc_fh, ">>:encoding(UTF-8)", $PNC_LOG;
|
30 | 31 |
|
31 |
| -my ($timestamp, $userid, $auth) = ("", "", ""); |
32 |
| -my ($oldfn, $newfn, $oldln, $newln, $line1, $line2); |
| 32 | +# fn = firstname/givenname, ln = lastname/familyname |
| 33 | +my ($timestamp, $userid, $auth, $oldfn, $newfn, $oldln, $newln, $line1, $line2); |
| 34 | +my $regex_check = 1; |
33 | 35 | while (<$psql_fh>) {
|
34 |
| - ($timestamp, $userid, $oldfn, $newfn, $oldln, $newln) = ($1, $2, $3, $4, $5, $6) if (/^${datestamp} (\d{2}:\d{2}:\d{2}\.\d{3} [A-Z]{3}).+DETAIL: USER_ID: "(.+?)" (?:PREFERRED_FIRSTNAME OLD: "(.*?)" NEW: "(.*?)" )?(?:PREFERRED_LASTNAME OLD: "(.*?)" NEW: "(.*?)")?$/); |
35 |
| - $auth = $1 if (/\/\* AUTH: "(.+)" \*\//); |
36 |
| - # $auth is always on a different line than $timestamp, $userid. |
37 |
| - # But all three having data will indicate we have collected pref name change logs. |
38 |
| - if ($timestamp ne "" && $userid ne "" && $auth ne "") { |
39 |
| - # $oldfn, $newfn, $oldln, $oldfn -- some may be undefined. |
40 |
| - # This happens when either the firstname or lastname change wasn't recorded in PSQL logs (because no change occured). |
41 |
| - # Undefined vars need to be defined to prevent 'concatenation by undefned var' warning. |
42 |
| - foreach ($oldfn, $newfn, $oldln, $newln) { |
43 |
| - $_ = "" if (!defined $_); |
| 36 | + if ($regex_check == 1) { |
| 37 | + if ($_ =~ m/^${datestamp} (\d{2}:\d{2}:\d{2}\.\d{3} [A-Z]{3}).+LOG: PREFERRED_NAME DATA UPDATE$/) { |
| 38 | + $timestamp = $1; |
| 39 | + $regex_check = 2; |
44 | 40 | }
|
45 |
| - |
46 |
| - # If both old and new firstnames are blank, no change was logged. |
47 |
| - if ($oldfn ne "" || $newfn ne "") { |
48 |
| - ($oldfn, $newfn) = rpad(19, $oldfn, $newfn); |
49 |
| - $line1 = " OLD PREF FIRSTNAME: ${oldfn}"; |
50 |
| - $line2 = " NEW PREF FIRSTNAME: ${newfn}"; |
51 |
| - } else { |
52 |
| - ($line1, $line2) = ("", ""); |
53 |
| - ($line1, $line2) = rpad(41, $line1, $line2); |
| 41 | + } elsif ($regex_check == 2) { |
| 42 | + if ($_ =~ m/DETAIL: USER_ID: "(.+?)" (?:PREFERRED_GIVENNAME OLD: "(.*?)" NEW: "(.*?)" )?(?:PREFERRED_FAMILYNAME OLD: "(.*?)" NEW: "(.*?)")?/) { |
| 43 | + ($userid, $oldfn, $newfn, $oldln, $newln) = ($1, $2, $3, $4, $5); |
| 44 | + $regex_check = 3; |
54 | 45 | }
|
| 46 | + } elsif ($regex_check == 3) { |
| 47 | + if ($_ =~ m/\/\* AUTH: "(.+)" \*\//) { |
| 48 | + $auth = $1; |
55 | 49 |
|
56 |
| - # If both old and new lastnames are blank, no change was logged. |
57 |
| - if ($oldln ne "" || $newln ne "") { |
58 |
| - ($oldln, $oldfn) = rpad(19, $oldln, $oldfn); |
59 |
| - $line1 .= " OLD PREF LASTNAME: ${oldln}\n"; |
60 |
| - $line2 .= " NEW PREF LASTNAME: ${newln}\n"; |
61 |
| - } else { |
62 |
| - $line1 .= "\n"; |
63 |
| - $line2 .= "\n"; |
64 |
| - } |
| 50 | + # $oldfn, $newfn, $oldln, $oldfn -- some may be undefined. |
| 51 | + # This happens when either the givenname or familyname change wasn't recorded in PSQL logs (because no change occured). |
| 52 | + # Undefined vars need to be defined to prevent 'concatenation by undefned var' warning. |
| 53 | + foreach ($oldfn, $newfn, $oldln, $newln) { |
| 54 | + $_ = "" if (!defined $_); |
| 55 | + } |
| 56 | + |
| 57 | + # If both old and new given names are blank, no change was logged. |
| 58 | + if ($oldfn ne "" || $newfn ne "") { |
| 59 | + ($oldfn, $newfn) = rpad(19, $oldfn, $newfn); |
| 60 | + $line1 = " OLD PREF GIVENNAME: ${oldfn}"; |
| 61 | + $line2 = " NEW PREF GIVENNAME: ${newfn}"; |
| 62 | + } else { |
| 63 | + ($line1, $line2) = ("", ""); |
| 64 | + ($line1, $line2) = rpad(41, $line1, $line2); |
| 65 | + } |
65 | 66 |
|
66 |
| - ($userid) = rpad(9, $userid); |
67 |
| - print $pnc_fh "${datestamp} ${timestamp} USER: ${userid} CHANGED BY: ${auth}\n"; |
68 |
| - print $pnc_fh $line1; |
69 |
| - print $pnc_fh $line2; |
70 |
| - ($timestamp, $userid, $auth) = ("", "", ""); |
| 67 | + # If both old and new family names are blank, no change was logged. |
| 68 | + if ($oldln ne "" || $newln ne "") { |
| 69 | + ($oldln, $oldfn) = rpad(19, $oldln, $oldfn); |
| 70 | + $line1 .= " OLD PREF FAMILYNAME: ${oldln}\n"; |
| 71 | + $line2 .= " NEW PREF FAMILYNAME: ${newln}\n"; |
| 72 | + } else { |
| 73 | + $line1 .= "\n"; |
| 74 | + $line2 .= "\n"; |
| 75 | + } |
| 76 | + |
| 77 | + ($userid) = rpad(9, $userid); |
| 78 | + print $pnc_fh "${datestamp} ${timestamp} USER: ${userid} CHANGED BY: ${auth}\n"; |
| 79 | + print $pnc_fh $line1; |
| 80 | + print $pnc_fh $line2; |
| 81 | + |
| 82 | + $regex_check = 1; |
| 83 | + } |
71 | 84 | }
|
72 | 85 | }
|
73 | 86 |
|
|
0 commit comments