Update log4j config to log api requests #499

rundeck · Aug 9, 2013 · a9eae59 · a9eae59
1 parent 7715611
commit a9eae59
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 2 deletions.
diff --git a/packaging/debroot/etc/rundeck/log4j.properties b/packaging/debroot/etc/rundeck/log4j.properties
@@ -24,6 +24,10 @@ log4j.additivity.com.dtolabs.rundeck.remoteservice.http.options=false
 log4j.logger.com.dtolabs.rundeck.data.jobs.changes=INFO, jobchanges
 log4j.additivity.com.dtolabs.rundeck.data.jobs.changes=false
 
+# Enable API request logging
+log4j.logger.org.rundeck.api.requests=INFO,apirequests
+log4j.additivity.org.rundeck.api.requests=false
+
 # Enable this logger to log Hibernate output
 # handy to see its database interaction activity
 #log4j.logger.org.hibernate=debug,stdout
@@ -123,3 +127,13 @@ log4j.appender.jobchanges.append=true
 log4j.appender.jobchanges.layout=org.apache.log4j.PatternLayout
 log4j.appender.jobchanges.layout.ConversionPattern=[%d{ISO8601}] %X{user} %X{change} [%X{id}] %X{project} "%X{groupPath}/%X{jobName}" (%X{method})%n
 
+#
+# api request log
+#
+# Logs all API requests
+#
+log4j.appender.apirequests=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.apirequests.file=/var/log/rundeck/rundeck.api.log
+log4j.appender.apirequests.append=true
+log4j.appender.apirequests.layout=org.apache.log4j.PatternLayout
+log4j.appender.apirequests.layout.ConversionPattern=[%d{ISO8601}] %X{remoteHost} %X{secure} %X{remoteUser} %X{authToken} "%X{method} %X{uri}" (%X{userAgent})%n
diff --git a/packaging/root/etc/rundeck/log4j.properties b/packaging/root/etc/rundeck/log4j.properties
@@ -24,6 +24,10 @@ log4j.additivity.com.dtolabs.rundeck.remoteservice.http.options=false
 log4j.logger.com.dtolabs.rundeck.data.jobs.changes=INFO, jobchanges
 log4j.additivity.com.dtolabs.rundeck.data.jobs.changes=false
 
+# Enable API request logging
+log4j.logger.org.rundeck.api.requests=INFO,apirequests
+log4j.additivity.org.rundeck.api.requests=false
+
 # Enable this logger to log Hibernate output
 # handy to see its database interaction activity
 #log4j.logger.org.hibernate=debug,stdout
@@ -123,3 +127,13 @@ log4j.appender.jobchanges.append=true
 log4j.appender.jobchanges.layout=org.apache.log4j.PatternLayout
 log4j.appender.jobchanges.layout.ConversionPattern=[%d{ISO8601}] %X{user} %X{change} [%X{id}] %X{project} "%X{groupPath}/%X{jobName}" (%X{method})%n
 
+#
+# api request log
+#
+# Logs all API requests
+#
+log4j.appender.apirequests=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.apirequests.file=/var/log/rundeck/rundeck.api.log
+log4j.appender.apirequests.append=true
+log4j.appender.apirequests.layout=org.apache.log4j.PatternLayout
+log4j.appender.apirequests.layout.ConversionPattern=[%d{ISO8601}] %X{remoteHost} %X{secure} %X{remoteUser} %X{authToken} "%X{method} %X{uri}" (%X{userAgent})%n
diff --git a/rundeck-launcher/launcher/src/main/resources/config-defaults.properties b/rundeck-launcher/launcher/src/main/resources/config-defaults.properties
@@ -30,4 +30,5 @@ default.admin.password=admin
 default.user.name=user
 default.user.password=user
 logger.options.format=[%d{ISO8601}] %X{httpStatusCode} %X{contentLength}B %X{durationTime}ms %X{lastModifiedDateTime} [%X{jobName}] %X{url} %X{contentSHA1}%n
-logger.jobchanges.format=[%d{ISO8601}] %X{user} %X{change} [%X{id}] %X{project} "%X{groupPath}/%X{jobName}" (%X{method})%X{extraInfo}%n
+logger.jobchanges.format=[%d{ISO8601}] %X{user} %X{change} [%X{id}] %X{project} "%X{groupPath}/%X{jobName}" (%X{method})%X{extraInfo}%n
+logger.apirequests.format=[%d{ISO8601}] %X{remoteHost} %X{secure} %X{remoteUser} %X{authToken} "%X{method} %X{uri}" (%X{userAgent})%n
diff --git a/...auncher/src/main/resources/templates/exp/webapp/WEB-INF/classes/log4j.properties.template b/...auncher/src/main/resources/templates/exp/webapp/WEB-INF/classes/log4j.properties.template
@@ -16,6 +16,10 @@ log4j.additivity.com.dtolabs.rundeck.remoteservice.http.options=false
 log4j.logger.com.dtolabs.rundeck.data.jobs.changes=INFO, jobchanges
 log4j.additivity.com.dtolabs.rundeck.data.jobs.changes=false
 
+# Enable API request logging
+log4j.logger.org.rundeck.api.requests=INFO,apirequests
+log4j.additivity.org.rundeck.api.requests=false
+
 # Enable this logger to log Hibernate output
 # handy to see its database interaction activity
 #log4j.logger.org.hibernate=debug,stdout
@@ -89,3 +93,14 @@ log4j.appender.jobchanges.file=${rundeck.log.dir}/rundeck.jobs.log
 log4j.appender.jobchanges.append=true
 log4j.appender.jobchanges.layout=org.apache.log4j.PatternLayout
 log4j.appender.jobchanges.layout.ConversionPattern=${logger.jobchanges.format}
+
+#
+# api request log
+#
+# Logs all API requests
+#
+log4j.appender.apirequests=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.apirequests.file=${rundeck.log.dir}/rundeck.api.log
+log4j.appender.apirequests.append=true
+log4j.appender.apirequests.layout=org.apache.log4j.PatternLayout
+log4j.appender.apirequests.layout.ConversionPattern=${logger.apirequests.format}
diff --git a/rundeckapp/grails-app/conf/Config.groovy b/rundeckapp/grails-app/conf/Config.groovy
@@ -89,8 +89,13 @@ log4j={
 
     warn 'org.mortbay.log'
     warn 'grails.app.filters.AuthorizationFilters'
-
 //    info 'com.dtolabs.rundeck.core.authorization.providers.SAREAuthorization'
+
+    environments {
+        development {
+            info 'org.rundeck.api.requests'
+        }
+    }
 }