Add processing phase tag "SC" for scan phase

diff --git a/gatekeeper.pl b/gatekeeper.pl
index a23535eccee273beac0b7532497558fb4ca34648..82be9f16346e2f40089bebf5e9ff306993a5f430 100755 (executable)
--- a/gatekeeper.pl
+++ b/gatekeeper.pl
@@ -2387,7 +2387,12 @@ sub cleanup {
 # - Main execution path
 #
 
-my @packets = gather_packets($incoming_dir, $incoming_tmp);
+our $Phase;
+my @packets;
+{
+  local $Phase = 'SC';
+  @packets = gather_packets($incoming_dir, $incoming_tmp);
+}
 
 # we've moved the files to work on to a new directory.
 chdir ($incoming_tmp)

diff --git a/testsuite/lib/gatekeeper.exp b/testsuite/lib/gatekeeper.exp
index 224ab76e0cfbc08918d6b5874451e4b3dc9b2905..12d56f38808b866873b47f3ba99a43497034cd3a 100644 (file)
--- a/testsuite/lib/gatekeeper.exp
+++ b/testsuite/lib/gatekeeper.exp
@@ -533,59 +533,59 @@ proc analyze_log { base_dir name assess } {
                     exp_continue
                 }
 
-       -re {^gatekeeper\[[0-9]+\]: \(Test\)\
+       -re {^gatekeeper\[[0-9]+\]: \(Test\) \[SC\]\
                 DEBUG: uploaded file to check: ([^\r\n]+)} {
                     # from scan_incoming readdir loop
                     set A(scan,$expect_out(1,string)) 1
                     exp_continue
                 }
-       -re {^gatekeeper\[[0-9]+\]: \(Test\)\
+       -re {^gatekeeper\[[0-9]+\]: \(Test\) \[SC\]\
                 [0-9]+ files with bogus names were trashcanned} {
                     # from scan_incoming, reporting count of bad file names
                     exp_continue
                 }
-       -re {^gatekeeper\[[0-9]+\]: \(Test\)\
+       -re {^gatekeeper\[[0-9]+\]: \(Test\) \[SC\]\
                 Trashcanned files removed} {
                     # from scan_incoming, when garbage files are purged
                     exp_continue
                 }
-       -re {^gatekeeper\[[0-9]+\]: \(Test\)\
+       -re {^gatekeeper\[[0-9]+\]: \(Test\) \[SC\]\
                 DEBUG: lsof command line: [^\r\n]*} {
                     # from scan_incoming, tracing lsof call
                     exp_continue
                 }
-       -re {^gatekeeper\[[0-9]+\]: \(Test\)\
+       -re {^gatekeeper\[[0-9]+\]: \(Test\) \[SC\]\
                 DEBUG: lsof output: [^\r\n]*} {
                     # from scan_incoming, tracing lsof output
                     exp_continue
                 }
-       -re {^gatekeeper\[[0-9]+\]: \(Test\)\
+       -re {^gatekeeper\[[0-9]+\]: \(Test\) \[SC\]\
                 DEBUG: upload in progress for ([^,]+),\
                 ignoring during this run} {
                     # from scan_incoming, when lsof reports file still open
                     set A(open,$expect_out(1,string)) 1
                     exp_continue
                 }
-       -re {^gatekeeper\[[0-9]+\]: \(Test\)\
+       -re {^gatekeeper\[[0-9]+\]: \(Test\) \[SC\]\
                 DEBUG: ([^ ]+) has[^,]+, skipping} {
                     # from scan_incoming, when recent mtime excludes a file
                     set A(recent,$expect_out(1,string)) 1
                     exp_continue
                 }
-       -re {^gatekeeper\[[0-9]+\]: \(Test\)\
+       -re {^gatekeeper\[[0-9]+\]: \(Test\) \[SC\]\
                 DEBUG: considering stem \[([^ ]+)\] for processing.} {
                     # from scan_incoming, top of packet checking loop
                     set A(consider,$expect_out(1,string)) 1
                     exp_continue
                 }
-       -re {^gatekeeper\[[0-9]+\]: \(Test\)\
+       -re {^gatekeeper\[[0-9]+\]: \(Test\) \[SC\]\
                 processing [[]([^]]+)\]} {
                     # from scan_incoming, when a packet is found
                     set A(found-packet) 1
                     set A(found-packet,$expect_out(1,string)) 1
                     exp_continue
                 }
-       -re {^gatekeeper\[[0-9]+\]: \(Test\)\
+       -re {^gatekeeper\[[0-9]+\]: \(Test\) \[SC\]\
                 Found directive file with filename directive \(([^ ]+)\),\
                 but no accompanying files.\
                 Ignoring directive file in this run.} {
@@ -593,13 +593,13 @@ proc analyze_log { base_dir name assess } {
                     set A(skip-loose,$expect_out(1,string)) 1
                     exp_continue
                 }
-       -re {^gatekeeper\[[0-9]+\]: \(Test\)\
+       -re {^gatekeeper\[[0-9]+\]: \(Test\) \[SC\]\
                 Overlength directive file \(([^ ]+)\) [^\r\n]+} {
                     # from scan_incoming, on finding an oversize directive
                     set A(oversize-directive,$expect_out(1,string)) 1
                     exp_continue
                 }
-       -re {^gatekeeper\[[0-9]+\]: \(Test\)\
+       -re {^gatekeeper\[[0-9]+\]: \(Test\) \[SC\]\
                 Overlength signature file \(([^ ]+)\) [^\r\n]+} {
                     # from scan_incoming, on finding an oversize signature
                     set A(oversize-signature,$expect_out(1,string)) 1