Mwalker has submitted this change and it was merged.
Change subject: Adding verbose logging to help diagnose problems in the wr1 log
parser
......................................................................
Adding verbose logging to help diagnose problems in the wr1 log parser
Change-Id: Ib10621ed96394fe30cd56afe3ce69c71d3989b97
---
M sites/all/modules/globalcollect_audit/globalcollect_audit.drush.inc
M sites/all/modules/globalcollect_audit/globalcollect_audit.module
2 files changed, 14 insertions(+), 2 deletions(-)
Approvals:
Mwalker: Verified; Looks good to me, approved
diff --git
a/sites/all/modules/globalcollect_audit/globalcollect_audit.drush.inc
b/sites/all/modules/globalcollect_audit/globalcollect_audit.drush.inc
index 6c3fb6e..e8408f8 100644
--- a/sites/all/modules/globalcollect_audit/globalcollect_audit.drush.inc
+++ b/sites/all/modules/globalcollect_audit/globalcollect_audit.drush.inc
@@ -24,6 +24,7 @@
'drush gc_wr1 --run_all' => '# Batch search for all missing
transactions across all wr1 files.',
'drush gc_wr1 --charlimit=50' => '# Will cause echoing to line
break after 50 characters',
'drush gc_wr1 --mismatch_override' => 'Won\'t die on a keygrind
mismatch',
+ 'drush gc_wr1 --verbose' => 'Verbose output',
),
'aliases' => array( 'gc_wr1' ),
);
@@ -51,6 +52,7 @@
'globalcollect_audit_run_all_wr1' => false,
'globalcollect_audit_charlimit' => 0,
'globalcollect_audit_mismatch_override' => false,
+ 'globalcollect_audit_verbose' => false,
);
}
@@ -94,7 +96,11 @@
echo "Overriding keygrind mismatches. Problem records will not
be fatal, but they will still be logged.\n";
variable_set( 'globalcollect_audit_mismatch_override', true );
}
-
+ if ( drush_get_option( 'verbose' ) ) {
+ echo "Outputting verbose.\n";
+ variable_set( 'globalcollect_audit_verbose', true );
+ }
+
module_invoke( 'globalcollect_audit', 'parse_all_wr1' );
//Be Kind: Rewind (your run settings).
diff --git a/sites/all/modules/globalcollect_audit/globalcollect_audit.module
b/sites/all/modules/globalcollect_audit/globalcollect_audit.module
index c645991..3dd61ff 100644
--- a/sites/all/modules/globalcollect_audit/globalcollect_audit.module
+++ b/sites/all/modules/globalcollect_audit/globalcollect_audit.module
@@ -253,6 +253,7 @@
$processed_id_count += 1;
$cmd = "grep <ORDERID>" . trim($grepforme) .
"</ORDERID> $logname";
+ globalcollect_audit_echo( __FUNCTION__ . ' ' . $cmd,
true );
$ret = array();
exec( escapeshellcmd($cmd), $ret, $errorlevel );
//echo $cmd . "\n";
@@ -260,6 +261,7 @@
if ( !count( $ret ) ){
$cmd = "grep <ORDERID>" . trim($grepforme) .
"</ORDERID> $logname2";
+ globalcollect_audit_echo( __FUNCTION__ . ' ' .
$cmd, true );
$ret = array();
exec( escapeshellcmd($cmd), $ret, $errorlevel );
}
@@ -1250,6 +1252,7 @@
function globalcollect_audit_get_log_data_by_order_id( $order_id, $log ){
$cmd = "grep <ORDERID>$order_id</ORDERID> $log";
+ globalcollect_audit_echo( __FUNCTION__ . ' ' . $cmd, true );
//echo $cmd . "\n";
$ret = array();
@@ -1692,7 +1695,10 @@
}
-function globalcollect_audit_echo( $echo ){
+function globalcollect_audit_echo( $echo, $verbose = false ) {
+ if ( $verbose && variable_get( 'globalcollect_audit_verbose', false )
=== false ) {
+ return;
+ }
static $chars = 0;
static $limit = null;
if (is_null($limit)){
--
To view, visit https://gerrit.wikimedia.org/r/77725
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib10621ed96394fe30cd56afe3ce69c71d3989b97
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Katie Horn <[email protected]>
Gerrit-Reviewer: Mwalker <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
