Skip to content

Commit 408c040

Browse files
author
Igor Polevoy
committed
#322 Support logging as JSON
1 parent ec8aabc commit 408c040

35 files changed

+520
-163
lines changed

‎activeweb-lessc-integration-test/pom.xml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,14 @@
110110
</exclusions>
111111
</dependency>
112112

113+
<dependency>
114+
<groupId>org.slf4j</groupId>
115+
<artifactId>slf4j-api</artifactId>
116+
</dependency>
117+
113118
<dependency>
114119
<groupId>org.slf4j</groupId>
115120
<artifactId>slf4j-simple</artifactId>
116-
<version>1.7.10</version>
117-
<scope>test</scope>
118121
</dependency>
119122

120123
<dependency>
@@ -123,10 +126,5 @@
123126
<version>2.0.11</version>
124127
</dependency>
125128

126-
<dependency>
127-
<groupId>org.slf4j</groupId>
128-
<artifactId>slf4j-api</artifactId>
129-
<version>1.7.10</version>
130-
</dependency>
131129
</dependencies>
132130
</project>

‎activeweb-lessc-integration-test/src/test/test-project/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<dependency>
5858
<groupId>org.slf4j</groupId>
5959
<artifactId>slf4j-simple</artifactId>
60-
<version>1.6.4</version>
60+
<version>1.7.0</version>
6161
</dependency>
6262
</dependencies>
6363
</project>

‎activeweb-testing/src/main/java/org/javalite/activeweb/DBSpecHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
*/
3131
public class DBSpecHelper {
3232

33-
private static Logger LOGGER = LoggerFactory.getLogger(DBSpecHelper.class.getSimpleName());
33+
private static Logger LOGGER = LoggerFactory.getLogger(DBSpecHelper.class);
3434

3535
private DBSpecHelper() {}
3636

‎activeweb-testing/src/main/java/org/javalite/activeweb/RequestBuilder.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ public void options(String actionName) {
331331
}
332332

333333

334-
private void submitRequest(String actionName, HttpMethod method) {
334+
private void submitRequest(String actionName, HttpMethod method) throws RuntimeException {
335335

336336
checkParamAndMultipart();
337337

@@ -382,7 +382,7 @@ private void submitRequest(String actionName, HttpMethod method) {
382382
addParameterValues(request);
383383
try{
384384
AppController controller = createControllerInstance(getControllerClassName(controllerPath));
385-
Context.setRoute(new Route(controller, realAction, id));
385+
Context.setRoute(new Route(controller, realAction, id, method));
386386
Injector injector = Context.getControllerRegistry().getInjector();
387387

388388
if(injector != null){
@@ -394,7 +394,7 @@ private void submitRequest(String actionName, HttpMethod method) {
394394
Context.setControllerResponse(null);
395395
Context.setHttpResponse(new MockHttpServletResponse());
396396

397-
runner.run(new Route(controller, actionName), integrateViews);
397+
runner.run(new Route(controller, actionName, method), integrateViews);
398398
}catch(WebException e){
399399
throw e;
400400
}catch(RuntimeException e){

‎activeweb/pom.xml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,16 @@
5454
</dependency>
5555

5656
<dependency>
57-
<groupId>org.slf4j</groupId>
58-
<artifactId>slf4j-simple</artifactId>
57+
<groupId>org.slf4j</groupId>
58+
<artifactId>slf4j-log4j12</artifactId>
5959
</dependency>
6060

61+
<dependency>
62+
<groupId>log4j</groupId>
63+
<artifactId>log4j</artifactId>
64+
</dependency>
65+
66+
6167
<dependency>
6268
<groupId>com.google.inject</groupId>
6369
<artifactId>guice</artifactId>

‎activeweb/src/main/java/org/javalite/activeweb/AbstractControllerConfig.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,7 @@ protected ExcludeBuilder addGlobalFilters(ControllerFilter... filters) {
146146
}
147147

148148
@Override
149-
public void completeInit() {
150-
149+
protected void completeInit() {
151150
for (ExcludeBuilder excludeBuilder : excludeBuilders) {
152151
Context.getControllerRegistry().addGlobalFilters(excludeBuilder.getFilters(), excludeBuilder.getExcludeControllerClasses());
153152
}

‎activeweb/src/main/java/org/javalite/activeweb/AppConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@
2121
*/
2222
public abstract class AppConfig {
2323
public abstract void init(AppContext appContext);
24-
public void completeInit(){}
24+
protected void completeInit(){}
2525
}

‎activeweb/src/main/java/org/javalite/activeweb/Configuration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
* @author Igor Polevoy
3434
*/
3535
public class Configuration {
36-
private static final Logger LOGGER = LoggerFactory.getLogger(Configuration.class.getSimpleName());
36+
private static final Logger LOGGER = LoggerFactory.getLogger(Configuration.class);
3737

3838
enum Params {
3939
templateManager, bootstrap, defaultLayout, targetDir, rootPackage, dbconfig, controllerConfig, rollback,

‎activeweb/src/main/java/org/javalite/activeweb/ControllerPackageLocator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
*/
3737
class ControllerPackageLocator {
3838

39-
private static Logger LOGGER = LoggerFactory.getLogger(ControllerPackageLocator.class.getSimpleName());
39+
private static Logger LOGGER = LoggerFactory.getLogger(ControllerPackageLocator.class);
4040

4141
private ControllerPackageLocator() {}
4242

‎activeweb/src/main/java/org/javalite/activeweb/ControllerRunner.java

Lines changed: 23 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class ControllerRunner {
4040

4141
private boolean injectTags = Configuration.getTemplateManager() instanceof FreeMarkerTemplateManager;
4242

43-
private static Logger LOGGER = LoggerFactory.getLogger(ControllerRunner.class.getSimpleName());
43+
private static Logger LOGGER = LoggerFactory.getLogger(ControllerRunner.class);
4444
private boolean tagsInjected;
4545

4646
protected void run(Route route, boolean integrateViews) throws Exception {
@@ -59,10 +59,6 @@ protected void run(Route route, boolean integrateViews) throws Exception {
5959
if (checkActionMethod(route.getController(), actionMethod)) {
6060
//Configuration.getTemplateManager().
6161
injectController(route.getController());
62-
if(Configuration.logRequestParams()){
63-
LOGGER.info("Executing controller: " + route.getController().getClass().getName() + "." + actionMethod +
64-
", session: " + new SessionFacade().id());
65-
}
6662
executeAction(route.getController(), actionMethod);
6763
}
6864
}
@@ -212,7 +208,7 @@ private boolean checkActionMethod(AppController controller, String actionMethod)
212208
return true;
213209
}
214210

215-
private boolean exceptionHandled(Exception e, Route route, List<ControllerRegistry.FilterList> globalFilterLists, List<ControllerFilter> ... filterGroups) throws Exception{
211+
private boolean exceptionHandled(Exception e, Route route, List<ControllerRegistry.FilterList> globalFilterLists, List<ControllerFilter> controllerFilters) throws Exception{
216212

217213
//first, process global filters and account for exceptions
218214
for (ControllerRegistry.FilterList filterList : globalFilterLists) {
@@ -224,65 +220,66 @@ private boolean exceptionHandled(Exception e, Route route, List<ControllerRegist
224220
}
225221
}
226222

227-
for(List<ControllerFilter> filterGroup: filterGroups){
228-
for (ControllerFilter controllerFilter : filterGroup) {
229-
controllerFilter.onException(e);
230-
}
223+
for (ControllerFilter controllerFilter : controllerFilters) {
224+
controllerFilter.onException(e);
231225
}
232226
return Context.getControllerResponse() != null;
233227
}
234228

235-
private void filterBefore(Route route, List<ControllerRegistry.FilterList> globalFilterLists, List<ControllerFilter>... filterGroups) {
229+
private void filterBefore(Route route, List<ControllerRegistry.FilterList> globalFilterLists, List<ControllerFilter> controllerFilters) {
236230
try {
237231

238232
//first, process global filters and account for exceptions
239233
for (ControllerRegistry.FilterList filterList : globalFilterLists) {
240234
if(!filterList.excludesController(route.getController())){
241235
List<ControllerFilter> filters = filterList.getFilters();
242236
for (ControllerFilter controllerFilter : filters) {
237+
if (Configuration.logRequestParams()) {
238+
LOGGER.debug("Executing filter: " + controllerFilter.getClass().getName() + "#before");
239+
}
243240
controllerFilter.before();
244241
}
245242
}
246243
}
247244

248-
//then process all other filters
249-
for (List<ControllerFilter> filterGroup : filterGroups) {
250-
for (ControllerFilter controllerFilter : filterGroup) {
251-
if (Configuration.logRequestParams()) {
252-
LOGGER.debug("Executing filter: " + controllerFilter.getClass().getName() + "#before");
253-
}
254-
controllerFilter.before();
255-
if (Context.getControllerResponse() != null) return;//a filter responded!
245+
for (ControllerFilter controllerFilter : controllerFilters) {
246+
if (Configuration.logRequestParams()) {
247+
LOGGER.debug("Executing filter: " + controllerFilter.getClass().getName() + "#before");
256248
}
249+
controllerFilter.before();
250+
if (Context.getControllerResponse() != null) return;//a filter responded!
257251
}
252+
258253
}catch(RuntimeException e){
259254
throw e;
260255
}catch(Exception e){
261256
throw new FilterException(e);
262257
}
263258
}
264259

265-
private void filterAfter(Route route, List<ControllerRegistry.FilterList> globalFilterLists, List<ControllerFilter>... filterGroups) {
260+
private void filterAfter(Route route, List<ControllerRegistry.FilterList> globalFilterLists, List<ControllerFilter> controllerFilters) {
266261
try {
267262

268263
//first, process global filters and account for exceptions
269264
for (ControllerRegistry.FilterList filterList : globalFilterLists) {
270265
if(!filterList.excludesController(route.getController())){
271266
List<ControllerFilter> filters = filterList.getFilters();
272267
for (ControllerFilter controllerFilter : filters) {
268+
if (Configuration.logRequestParams()) {
269+
LOGGER.debug("Executing filter: " + controllerFilter.getClass().getName() + "#after");
270+
}
273271
controllerFilter.after();
274272
}
275273
}
276274
}
277275

278-
for (List<ControllerFilter> filterGroup : filterGroups) {
279-
for (int i = filterGroup.size() - 1; i >= 0; i--) {
280-
if(Configuration.logRequestParams()){
281-
LOGGER.debug("Executing filter: " + filterGroup.get(i).getClass().getName() + "#after" );
282-
}
283-
filterGroup.get(i).after();
276+
for (int i = controllerFilters.size() - 1; i >= 0; i--) {
277+
if (Configuration.logRequestParams()) {
278+
LOGGER.debug("Executing filter: " + controllerFilters.get(i).getClass().getName() + "#after");
284279
}
280+
controllerFilters.get(i).after();
285281
}
282+
286283
} catch (Exception e) {
287284
throw new FilterException(e);
288285
}

0 commit comments

Comments
 (0)