admin activity log made optional, turned off by default

diff --git a/etc/log4j.properties b/etc/log4j.properties
index 7b62d23..47616df 100755 (executable)
--- a/etc/log4j.properties
+++ b/etc/log4j.properties
@@ -78,10 +78,8 @@ log4j.appender.PDFGeneratorA.File=${log.home}/pdf.log
 log4j.appender.PDFGeneratorA.layout=org.apache.log4j.PatternLayout
 log4j.appender.PDFGeneratorA.layout.ConversionPattern=%d [%p] %c %x %m%n
 
-# remove these lines to have an admin activity logger:
-#
-#log4j.appender.AdminUsageA=org.apache.log4j.RollingFileAppender
-#log4j.appender.AdminUsageA.File=${log.home}/adminusage.log
-#log4j.appender.AdminUsageA.layout=org.apache.log4j.PatternLayout
-#log4j.appender.AdminUsageA.layout.ConversionPattern=%d %m%n
+log4j.appender.AdminUsageA=org.apache.log4j.RollingFileAppender
+log4j.appender.AdminUsageA.File=${log.home}/adminusage.log
+log4j.appender.AdminUsageA.layout=org.apache.log4j.PatternLayout
+log4j.appender.AdminUsageA.layout.ConversionPattern=%d %m%n
 

diff --git a/source/default.properties b/source/default.properties
index 0d63921..31479e0 100755 (executable)
--- a/source/default.properties
+++ b/source/default.properties
@@ -88,6 +88,8 @@ Mir.Admin.FallbackLanguage=en
 # Show who's logged in?
 Mir.Admin.ShowLoggedinUsers=1
 
+# Log admin activity?
+Mir.Admin.LogAdminActivity=0
 
 # Which usernames have admin priviliges (, seperated usernames)
 AccessControl.SuperUsers = admin

diff --git a/source/mircoders/global/MirGlobal.java b/source/mircoders/global/MirGlobal.java
index 70143bc..55f9f1c 100755 (executable)
--- a/source/mircoders/global/MirGlobal.java
+++ b/source/mircoders/global/MirGlobal.java
@@ -243,10 +243,12 @@ public class MirGlobal {
 \r
   public static void logAdminUsage(EntityUsers aUser, String anObject, String aDescription) {\r
     try {\r
-      String user = "unknown (" + aUser.toString() +")";\r
-      if (aUser!=null)\r
-        user = aUser.getValue("login");\r
-      adminUsageLogger.info(user + " | " + anObject + " | " + aDescription);\r
+      if (config().getString("Mir.Admin.LogAdminActivity", "0").equals("1")) {\r
+        String user = "unknown (" + aUser.toString() + ")";\r
+        if (aUser != null)\r
+          user = aUser.getValue("login");\r
+        adminUsageLogger.info(user + " | " + anObject + " | " + aDescription);\r
+      }\r
     }\r
     catch (Throwable t) {\r
       logger.error("Error while logging admin usage ("+aUser.toString()+", "+aDescription+"): " +t.toString());\r