PRESIDECMS-2715 Code hygeine changes from code review

pixl8 · Sep 22, 2023 · e089d2c · e089d2c
1 parent 613c2ed
commit e089d2c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/system/config/Config.cfc b/system/config/Config.cfc
@@ -306,18 +306,18 @@ component {
 					  class      = 'coldbox.system.logging.appenders.RollingFileAppender'
 					, properties = { filePath=settings.logsMapping, filename="coldbox.log", async=true }
 				},
-				taskmanagerRequestAppender = {
-					  class      = 'preside.system.services.logger.TaskmanagerLogAppender'
+				taskManagerRequestAppender = {
+					  class      = 'preside.system.services.logger.TaskManagerLogAppender'
 					, properties = { logName="TASKMANAGER" }
 				},
-				adhocTaskmanagerAppender = {
-					  class      = 'preside.system.services.logger.AdhocTaskmanagerLogAppender'
-					, properties = { logName="TASKMANAGER" }
+				adhocTaskManagerAppender = {
+					  class      = 'preside.system.services.logger.AdhocTaskManagerLogAppender'
+					, properties = { logName="ADHOCTASKMANAGER" }
 				}
 			},
 			root = { appenders='defaultLogAppender', levelMin='FATAL', levelMax='WARN' },
 			categories = {
-				taskManager      = { appenders='taskmanagerRequestAppender', levelMin='FATAL', levelMax='INFO' },
+				taskManager      = { appenders='taskManagerRequestAppender', levelMin='FATAL', levelMax='INFO' },
 				adhocTaskManager = { appenders='adhocTaskmanagerAppender'  , levelMin='FATAL', levelMax='INFO' }
 			}
 		};

diff --git a/system/handlers/admin/AdHocTaskManager.cfc b/system/handlers/admin/AdHocTaskManager.cfc
@@ -54,10 +54,10 @@ component extends="preside.system.base.AdminHandler" {
 		} else {
 			if ( Len( prc.taskProgress.log ) ) {
 				prc.taskProgress.lineCount = ListLen( prc.taskProgress.log, Chr( 10 ) );
-				prc.taskProgress.log = logRendererUtil.renderLegacyLogs( prc.taskProgress.log );
+				prc.taskProgress.log       = logRendererUtil.renderLegacyLogs( prc.taskProgress.log );
 			} else {
-				prc.taskProgress.log = logRendererUtil.renderLogs( adhocTaskManagerService.getLogLines( prc.taskProgress.id ) );
 				prc.taskProgress.lineCount = adhocTaskManagerService.getLogLineCount( prc.taskProgress.id );
+				prc.taskProgress.log       = logRendererUtil.renderLogs( adhocTaskManagerService.getLogLines( prc.taskProgress.id ) );
 			}
 			prc.taskProgress.timeTaken = renderContent( renderer="TaskTimeTaken", data=prc.taskProgress.timeTaken*1000, context=[ "accurate" ] );
 		}

diff --git a/system/services/taskmanager/LogRendererUtil.cfc b/system/services/taskmanager/LogRendererUtil.cfc
@@ -31,8 +31,8 @@ component {
 		var outputArray = [];
 
 		for( var i=arguments.fetchAfterLines+1; i <= logArray.len(); i++ ){
-			var line = logArray[ i ];
-			var logClass = LCase( ReReplace( line, '^\[(.*?)\].*$', '\1' ) );
+			var line          = logArray[ i ];
+			var logClass      = LCase( ReReplace( line, '^\[(.*?)\].*$', '\1' ) );
 			var dateTimeRegex = "(\[20[0-9]{2}\-[0-9]{2}\-[0-9]{2}\s[0-9]{2}:[0-9]{2}:[0-9]{2}\])";
 
 			line = ReReplace( line, dateTimeRegex, '<span class="task-log-datetime">\1</span>' );

diff --git a/system/services/taskmanager/TaskManagerService.cfc b/system/services/taskmanager/TaskManagerService.cfc
@@ -509,7 +509,6 @@ component displayName="Task Manager Service" {
 		);
 	}
 
-
 	public struct function runScheduledTasks() {
 		var settings              = _getSystemConfigurationService().getCategorySettings( "taskmanager" );
 		var scheduledTasksEnabled = settings.scheduledtasks_enabled ?: false;
-Original file line number
+Diff line change
@@ Expand Up / @@ -509,7 +509,6 @@ component displayName="Task Manager Service" { @@
     		);
     	}
     	public struct function runScheduledTasks() {
     		var settings              = _getSystemConfigurationService().getCategorySettings( "taskmanager" );
     		var scheduledTasksEnabled = settings.scheduledtasks_enabled ?: false;
@@ Expand Down @@