3.0.0.37 - fix log pathing

zspitzer · Sep 3, 2020 · ff73bec · ff73bec
1 parent ab4896b
commit ff73bec
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/box.json b/box.json
@@ -1,7 +1,7 @@
 {
     "name":"Lucee Log Viewer",
     "author":"Zac Spitzer",
-    "version":"3.0.0.36",
+    "version":"3.0.0.37",
     "bugs":"https://github.com/zspitzer/lucee-logviewer/issues",
     "thumbnail": "https://raw.githubusercontent.com/zspitzer/lucee-logviewer/refactoring/build/images/logo.png",
     "changelog":"",

diff --git a/build.number b/build.number
@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Thu Sep 03 13:06:19 CEST 2020
-build.number=37
+#Thu Sep 03 14:35:17 CEST 2020
+build.number=38
diff --git a/dist/modern/extension-logViewer-3.0.0.36.lex → dist/modern/extension-logViewer-3.0.0.37.lex b/dist/modern/extension-logViewer-3.0.0.36.lex → dist/modern/extension-logViewer-3.0.0.37.lex
diff --git a/source/cfml/plugins/LogConfig.cfc b/source/cfml/plugins/LogConfig.cfc
@@ -30,25 +30,24 @@ component hint="update log configuration" {
 		ListToArray(arguments.logConfig).each(function(v){
 			_logConfig[v]=true;
 		});
-
 		if (logStorage eq "file"){
 			var _log = {
 				charset	: "windows-1252",
 				maxfiles: "10",
 				maxfilesize: "10485760",
-				path: "{lucee-config}/",
+				path: "{lucee-config}/logs",
 				timeout :"60"
 			}
 			var _java = {				
 				layoutClass: "lucee.commons.io.log.log4j.layout.ClassicLayout",
 				appenderClass: "lucee.commons.io.log.log4j.appender.RollingResourceAppender"
 			};
-			if ( request.admintype != "server")
-				_log.path = "{lucee-web}/";
+			//if ( request.admintype != "server")
+			//	_log.path = "{lucee-config}/logs";
 			loop query="#local.existinglogConfig#"  {
 				if (StructKeyExists(_logconfig, local.existinglogConfig.name)){					
 					var _logSettings = duplicate(_log);
-					_logSettings.path = local.existinglogConfig.name & ".log";
+					_logSettings.path = _log.path & "/" & local.existinglogConfig.name & ".log";
 					updateLogSetting(local.existinglogConfig.name, _logSettings, _java,
 						QueryRowData(local.existinglogConfig, local.existinglogConfig.currentrow)
 					);