Skip to content

Commit c74077f

Browse files
ryanrathryanrath
committed
Changes for PSR3 Logging
1 parent f556d3b commit c74077f

40 files changed

+409
-599
lines changed

‎background_scripts/batch_export_manager.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
require_once __DIR__ . '/../configuration/linker.php';
88

99
use CCR\Log;
10-
use CCR\LogOutput;
1110
use DataWarehouse\Export\BatchProcessor;
1211

1312
// Disable memory limit.
@@ -84,12 +83,12 @@
8483
$logger = Log::factory('batch-export', $logConf);
8584
$logger->info('Command: ' . implode(' ', array_map('escapeshellarg', $argv)));
8685
// NOTE: "process_start_time" is needed for the log summary.
87-
$logger->notice(LogOutput::from(['message' => 'batch_export_manager start', 'process_start_time' => date('Y-m-d H:i:s')]));
86+
$logger->notice('batch_export_manager start', ['process_start_time' => date('Y-m-d H:i:s')]);
8887
$batchProcessor = new BatchProcessor($logger);
8988
$batchProcessor->setDryRun($dryRun);
9089
$batchProcessor->processRequests();
9190
// NOTE: "process_end_time" is needed for the log summary.
92-
$logger->notice(LogOutput::from(['message' => 'batch_export_manager end', 'process_end_time' => date('Y-m-d H:i:s')]));
91+
$logger->notice('batch_export_manager end', ['process_end_time' => date('Y-m-d H:i:s')]);
9392
@flock($lockFileHandle, LOCK_UN);
9493
@fclose($lockFileHandle);
9594
@unlink($lockFile);

‎background_scripts/report_schedule_manager.php‎

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
require_once __DIR__ . '/../configuration/linker.php';
3232

3333
use CCR\Log;
34-
use CCR\LogOutput;
3534

3635
// Maintenance mode for testing.
3736
$maint_mode = false;
@@ -67,10 +66,7 @@
6766
// =====================================================================
6867

6968
// NOTE: "process_start_time" is needed for log summary.
70-
$logger->notice(LogOutput::from(array(
71-
'message' => 'Report scheduler start',
72-
'process_start_time' => date('Y-m-d H:i:s')
73-
)));
69+
$logger->notice('Report scheduler start',['process_start_time' => date('Y-m-d H:i:s')]);
7470

7571
$active_frequencies = getActiveFrequencies(true);
7672

@@ -91,10 +87,7 @@
9187
} catch (Exception $e) {
9288
$msg = "Failed to get user for id = {$details['user_id']}: "
9389
. $e->getMessage();
94-
$logger->error(LogOutput::from(array(
95-
'message' => $msg,
96-
'stacktrace' => $e->getTraceAsString(),
97-
)));
90+
$logger->error($msg, ['stacktrace' => $e->getTraceAsString()]);
9891
continue;
9992
}
10093

@@ -122,10 +115,7 @@
122115
} catch(Exception $e) {
123116
$msg = "Error Preparing report on " . gethostname() . " {$details['report_id']}: "
124117
. $e->getMessage();
125-
$logger->error(LogOutput::from(array(
126-
'message' => $msg,
127-
'stacktrace' => $e->getTraceAsString(),
128-
)));
118+
$logger->error($msg,['stacktrace' => $e->getTraceAsString()]);
129119
}
130120

131121
if (isset($working_dir) && $working_dir != '/' && $working_dir != getcwd()) {
@@ -136,10 +126,7 @@
136126
}
137127

138128
// NOTE: "process_end_time" is needed for log summary.
139-
$logger->notice(LogOutput::from(array(
140-
'message' => 'Report scheduler end',
141-
'process_end_time' => date('Y-m-d H:i:s'),
142-
)));
129+
$logger->notice('Report scheduler end', ['process_end_time' => date('Y-m-d H:i:s')]);
143130

144131
exit;
145132

‎bin/xdmod-build-filter-lists‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
require_once __DIR__ . '/../configuration/linker.php';
55

66
use CCR\Log;
7-
use CCR\LogOutput;
87

98
// Disable memory limit.
109
ini_set('memory_limit', -1);
@@ -97,10 +96,7 @@ function build($realms, $logger){
9796
$filterListBuilder->buildAllLists();
9897
}
9998
} catch (Exception $e) {
100-
$logger->critical(LogOutput::from(array(
101-
'message' => 'Filter list building failed: ' . $e->getMessage(),
102-
'stacktrace' => $e->getTraceAsString(),
103-
)));
99+
$logger->critical('Filter list building failed: ' . $e->getMessage(), ['stacktrace' => $e->getTraceAsString()]);
104100
exit(1);
105101
}
106102
}

‎bin/xdmod-import-csv‎

Lines changed: 47 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ require_once __DIR__ . '/../configuration/linker.php';
1818

1919
use CCR\DB;
2020
use CCR\Log;
21-
use CCR\LogOutput;
2221

2322
// Disable memory limit.
2423
ini_set('memory_limit', -1);
@@ -134,10 +133,7 @@ function main()
134133
$logger = Log::factory('xdmod-import-csv', $conf);
135134

136135
// NOTE: "process_start_time" is needed for the log summary.
137-
$logger->notice(LogOutput::from(array(
138-
'message' => 'xdmod-import-csv start',
139-
'process_start_time' => date('Y-m-d H:i:s'),
140-
)));
136+
$logger->notice('xdmod-import-csv start', ['process_start_time' => date('Y-m-d H:i:s')]);
141137

142138
$logger->debug('Checking for required arguments');
143139

@@ -163,10 +159,7 @@ function main()
163159
$shredderDb = DB::factory('shredder');
164160
} catch (Exception $e) {
165161
$msg = 'Failed to create database connection: ' . $e->getMessage();
166-
$logger->critical(LogOutput::from(array(
167-
'message' => $msg,
168-
'stacktrace' => $e->getTraceAsString(),
169-
)));
162+
$logger->critical($msg, ['stacktrace' => $e->getTraceAsString()]);
170163
exit(1);
171164
}
172165

@@ -227,20 +220,14 @@ function main()
227220
$logger->info('Committing database transaction');
228221
$db->commit();
229222
} catch (Exception $e) {
230-
$logger->error(LogOutput::from(array(
231-
'message' => $e->getMessage(),
232-
'stacktrace' => $e->getTraceAsString(),
233-
)));
223+
$logger->error($e->getMessage(), ['stacktrace' => $e->getTraceAsString()]);
234224

235225
$logger->info('Rolling back database transaction');
236226
$db->rollBack();
237227
}
238228

239229
// NOTE: "process_end_time" is needed for the log summary.
240-
$logger->notice(LogOutput::from(array(
241-
'message' => 'xdmod-import-csv end',
242-
'process_end_time' => date('Y-m-d H:i:s'),
243-
)));
230+
$logger->notice('xdmod-import-csv end', ['process_end_time' => date('Y-m-d H:i:s')]);
244231

245232
exit;
246233
}
@@ -324,13 +311,14 @@ function createPerson($username, $firstName, $lastName, $organizationId)
324311
{
325312
global $db, $shredderDb, $logger;
326313

327-
$logger->debug(LogOutput::from(array(
328-
'message' => 'Creating person',
329-
'username' => $username,
330-
'first_name' => $firstName,
331-
'last_name' => $lastName,
332-
'organization_id' => $organizationId
333-
)));
314+
$logger->debug('Creating person',
315+
[
316+
'username' => $username,
317+
'first_name' => $firstName,
318+
'last_name' => $lastName,
319+
'organization_id' => $organizationId
320+
]
321+
);
334322

335323
$sql = "
336324
REPLACE INTO staging_union_user_pi SET
@@ -373,13 +361,14 @@ function updatePerson($personId, $firstName, $lastName, $organizationId)
373361
{
374362
global $db, $logger;
375363

376-
$logger->debug(LogOutput::from(array(
377-
'message' => 'Updating person',
378-
'person_id' => $personId,
379-
'first_name' => $firstName,
380-
'last_name' => $lastName,
381-
'organization_id' => $organizationId
382-
)));
364+
$logger->debug('Updating person',
365+
[
366+
'person_id' => $personId,
367+
'first_name' => $firstName,
368+
'last_name' => $lastName,
369+
'organization_id' => $organizationId
370+
]
371+
);
383372

384373
$sql = "
385374
UPDATE hpcdb_people SET
@@ -463,12 +452,13 @@ function createHierarchyItem($abbrev, $desc = null, $parentId = null)
463452
{
464453
global $db, $logger;
465454

466-
$logger->debug(LogOutput::from(array(
467-
'message' => 'Creating hierarchy item',
468-
'abbrev' => $abbrev,
469-
'desc' => $desc,
470-
'parent_id' => $parentId,
471-
)));
455+
$logger->debug('Creating hierarchy item',
456+
[
457+
'abbrev' => $abbrev,
458+
'desc' => $desc,
459+
'parent_id' => $parentId
460+
]
461+
);
472462

473463
$params = array('abbrev' => $abbrev);
474464

@@ -513,13 +503,14 @@ function updateHierarchyItem(
513503
) {
514504
global $db, $logger;
515505

516-
$logger->debug(LogOutput::from(array(
517-
'message' => 'Updating hierarchy item',
518-
'hierarchy_id' => $hierarchyId,
519-
'abbrev' => $abbrev,
520-
'desc' => $desc,
521-
'parent_id' => $parentId,
522-
)));
506+
$logger->debug('Updating hierarchy item',
507+
[
508+
'hierarchy_id' => $hierarchyId,
509+
'abbrev' => $abbrev,
510+
'desc' => $desc,
511+
'parent_id' => $parentId
512+
]
513+
);
523514

524515
$params = array('abbrev' => $abbrev);
525516

@@ -611,11 +602,12 @@ function createPi($groupname, $hierarchyId)
611602
{
612603
global $db, $shredderDb, $logger;
613604

614-
$logger->debug(LogOutput::from(array(
615-
'message' => 'Creating PI',
616-
'groupname' => $groupname,
617-
'hierarchy_id' => $hierarchyId,
618-
)));
605+
$logger->debug('Creating PI',
606+
[
607+
'groupname' => $groupname,
608+
'hierarchy_id' => $hierarchyId
609+
]
610+
);
619611

620612
$sql = "REPLACE INTO staging_pi SET pi_name = :pi_name";
621613
$piId = $shredderDb->insert($sql, array('pi_name' => $groupname));
@@ -676,11 +668,12 @@ function updatePersonHierarchyItem($personId, $hierarchyId)
676668
{
677669
global $db, $logger;
678670

679-
$logger->debug(LogOutput::from(array(
680-
'message' => 'Updating person to hierarchy map',
681-
'person_id' => $personId,
682-
'hierarchy_id' => $hierarchyId,
683-
)));
671+
$logger->debug('Updating person to hierarchy map',
672+
[
673+
'person_id' => $personId,
674+
'hierarchy_id' => $hierarchyId
675+
]
676+
);
684677

685678
$sql = "
686679
UPDATE hpcdb_requests r

‎bin/xdmod-ingestor‎

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ require_once __DIR__ . '/../configuration/linker.php';
1212

1313
use CCR\DB;
1414
use CCR\Log;
15-
use CCR\LogOutput;
1615
use OpenXdmod\DataWarehouseInitializer;
1716

1817
// Disable memory limit.
@@ -213,21 +212,15 @@ function main()
213212
}
214213

215214
// NOTE: "process_start_time" is needed for the log summary.
216-
$logger->notice(LogOutput::from(array(
217-
'message' => 'xdmod-ingestor start',
218-
'process_start_time' => date('Y-m-d H:i:s'),
219-
)));
215+
$logger->notice('xdmod-ingestor start', ['process_start_time' => date('Y-m-d H:i:s')]);
220216

221217
try {
222218
$logger->debug('Creating data warehouse initilializer');
223219
$dwi = new DataWarehouseInitializer($hpcdbDb, $dwDb);
224220
} catch (Exception $e) {
225221
$msg = 'Failed to create data warehouse initializer: '
226222
. $e->getMessage();
227-
$logger->critical(LogOutput::from(array(
228-
'message' => $msg,
229-
'stacktrace' => $e->getTraceAsString(),
230-
)));
223+
$logger->critical($msg, ['stacktrace' => $e->getTraceAsString()]);
231224
exit(1);
232225
}
233226

@@ -286,10 +279,7 @@ function main()
286279
exit($aclstatus);
287280
}
288281
} catch (Exception $e) {
289-
$logger->critical(LogOutput::from(array(
290-
'message' => 'Ingestion failed: ' . $e->getMessage(),
291-
'stacktrace' => $e->getTraceAsString(),
292-
)));
282+
$logger->critical('Ingestion failed: ' . $e->getMessage(), ['stacktrace' => $e->getTraceAsString()]);
293283
exit(1);
294284
}
295285
$logger->info('Done ingesting data');
@@ -315,20 +305,14 @@ function main()
315305
$dwi->aggregateResourceSpecs($lastModifiedStartDate);
316306
}
317307
} catch (Exception $e) {
318-
$logger->critical(LogOutput::from(array(
319-
'message' => 'Aggregation failed: ' . $e->getMessage(),
320-
'stacktrace' => $e->getTraceAsString(),
321-
)));
308+
$logger->critical('Aggregation failed: ' . $e->getMessage(), ['stacktrace' => $e->getTraceAsString()]);
322309
exit(1);
323310
}
324311
$logger->info('Done aggregating data');
325312
}
326313

327314
// NOTE: "process_end_time" is needed for the log summary.
328-
$logger->notice(LogOutput::from(array(
329-
'message' => 'xdmod-ingestor end',
330-
'process_end_time' => date('Y-m-d H:i:s'),
331-
)));
315+
$logger->notice('xdmod-ingestor end', ['process_end_time' => date('Y-m-d H:i:s')]);
332316

333317
exit;
334318
}

0 commit comments

Comments
 (0)