Cdentinger has uploaded a new change for review.
https://gerrit.wikimedia.org/r/247490
Change subject: Move Context/Logger init to wmf_audit_main
......................................................................
Move Context/Logger init to wmf_audit_main
The audit parsers should all be able to Logger
Change-Id: I586cb9fcc4782d49c829cc45917b42dea5cf39fd
---
M sites/all/modules/wmf_audit/amazon/amazon_audit.module
M sites/all/modules/wmf_audit/wmf_audit.module
2 files changed, 17 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/90/247490/1
diff --git a/sites/all/modules/wmf_audit/amazon/amazon_audit.module
b/sites/all/modules/wmf_audit/amazon/amazon_audit.module
index 9ede1e5..054cb18 100644
--- a/sites/all/modules/wmf_audit/amazon/amazon_audit.module
+++ b/sites/all/modules/wmf_audit/amazon/amazon_audit.module
@@ -1,8 +1,5 @@
<?php
-use SmashPig\Core\Configuration;
-use SmashPig\Core\Context;
-
/**
* Implementation of hook_menu()
*/
@@ -73,16 +70,5 @@
* ),
* );
*/
- $settings_file = DRUPAL_ROOT . '/sites/default/smashpig.settings.php';
- if ( !file_exists( $settings_file ) ) {
- $settings_file = null;
- }
- $config = new Configuration(
- DRUPAL_ROOT .
'/../vendor/wikimedia/smash-pig/config_defaults.php',
- $settings_file,
- 'amazon',
- true
- );
- Context::init( $config );
return new AmazonAuditProcessor( $options );
}
diff --git a/sites/all/modules/wmf_audit/wmf_audit.module
b/sites/all/modules/wmf_audit/wmf_audit.module
index 2b24b94..dd70926 100644
--- a/sites/all/modules/wmf_audit/wmf_audit.module
+++ b/sites/all/modules/wmf_audit/wmf_audit.module
@@ -1,5 +1,9 @@
<?php
+use SmashPig\Core\Configuration;
+use SmashPig\Core\Context;
+use SmashPig\Core\Logging\Logger;
+
define('WMF_AUDIT_PAYMENTS_LOGS_DIR', '/usr/local/src/logs/');
/**
@@ -34,6 +38,19 @@
* @param array $options Runtime parameters
*/
function wmf_audit_main( $gateway, $options ) {
+ $settings_file = DRUPAL_ROOT . '/sites/default/smashpig.settings.php';
+ if ( !file_exists( $settings_file ) ) {
+ $settings_file = null;
+ }
+ $config = new Configuration(
+ DRUPAL_ROOT . '/../vendor/wikimedia/smash-pig/config_defaults.php',
+ $settings_file,
+ 'amazon',
+ true
+ );
+ Context::init( $config );
+ Logger::init( $config->val( 'logging/root-context' ), $config->val(
'logging/log-level' ), $config );
+
$audit = module_invoke( "{$gateway}_audit", 'create_processor', $options );
if ( !$audit ) {
throw new Exception( "Gateway [$gateway] not found" );
--
To view, visit https://gerrit.wikimedia.org/r/247490
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I586cb9fcc4782d49c829cc45917b42dea5cf39fd
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Cdentinger <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
