atcoder
diff --git a/‎controller.go
Copy file name to clipboardExpand all lines: controller.go
-1Lines changed: 0 additions & 1 deletion b/‎controller.go
Copy file name to clipboardExpand all lines: controller.go
-1Lines changed: 0 additions & 1 deletion
diff --git a/‎module.go
Copy file name to clipboardExpand all lines: module.go
+1-1Lines changed: 1 addition & 1 deletion b/‎module.go
Copy file name to clipboardExpand all lines: module.go
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎router.go
Copy file name to clipboardExpand all lines: router.go
+6Lines changed: 6 additions & 0 deletions b/‎router.go
Copy file name to clipboardExpand all lines: router.go
+6Lines changed: 6 additions & 0 deletions
diff --git a/‎server-engine.go
Copy file name to clipboardExpand all lines: server-engine.go
+1-5Lines changed: 1 addition & 5 deletions b/‎server-engine.go
Copy file name to clipboardExpand all lines: server-engine.go
+1-5Lines changed: 1 addition & 5 deletions
@@ -28,7 +28,6 @@ type Controller struct {
 	AppController interface{}     // The controller that was instantiated. embeds revel.Controller
 	Action        string          // The fully qualified action name, e.g. "App.Index"
 	ClientIP      string          // holds IP address of request came from
-	module        *Module         // The module for the parent controller (if available)
 
 	Request  *Request
 	Response *Response
 
@@ -144,7 +144,7 @@ func addModule(name, importPath, modulePath string) {
 	if _, found := ModuleByName(name); found {
 		moduleLogger.Panic("Attempt to import duplicate module %s path %s aborting startup", "name", name, "path", modulePath)
 	}
-	Modules = append(Modules, &Module{Name: name, ImportPath: importPath, Path: modulePath, Log:AppLog.New("module", name)})
+	Modules = append(Modules, &Module{Name: name, ImportPath: importPath, Path: modulePath, Log:RootLog.New("module", name)})
 	if codePath := filepath.Join(modulePath, "app"); DirExists(codePath) {
 		CodePaths = append(CodePaths, codePath)
 		if viewsPath := filepath.Join(modulePath, "app", "views"); DirExists(viewsPath) {
 
@@ -749,6 +749,12 @@ func RouterFilter(c *Controller, fc []Filter) {
 
 	// Add the route and fixed params to the Request Params.
 	c.Params.Route = route.Params
+	// Assign logger if from module
+	if c.Type.ModuleSource!=nil && c.Type.ModuleSource!=appModule {
+		c.Log = c.Type.ModuleSource.Log.New("ip", c.ClientIP,
+			"path", c.Request.URL.Path, "method", c.Request.Method)
+	}
+
 
 	// Add the fixed parameters mapped by name.
 	// TODO: Pre-calculate this mapping.
 
@@ -139,11 +139,7 @@ func handleInternal(ctx ServerContext) {
 	}()
 
 	c.ClientIP = clientIP
-	controllerLog := AppLog
-	if c.module!=nil {
-		controllerLog = c.module.Log
-	}
-	c.Log = controllerLog.New("ip", clientIP,
+	c.Log = AppLog.New("ip", clientIP,
 		"path", req.GetPath(), "method", req.Method)
 	// Call the first filter, this will process the request
 	Filters[0](c, Filters[1:])