Merge 602ff4e into d7a5c54

main.go

@@ -50,7 +50,9 @@ func main() {
 			panic(fmt.Errorf("Failed to setup log dir"))
 		}
 	}
+
 	defer utils.InitUbiquityServerLogger()()
+
 	logger := logs.GetLogger()
 	oldLogger := utils.SetupOldLogger("ubiquity")
 

resources/resources.go

@@ -323,4 +323,5 @@ type FlexVolumeDetachRequest struct {
 
 type RequestContext struct {
 	Id string
+	ActionName	string
 }

utils/logs/go_logging_logger.go

@@ -77,14 +77,21 @@ func (l *goLoggingLogger) getContextStringFromGoid() string {
 	go_id := GetGoID()
 	context, exists := GoIdToRequestIdMap.Load(go_id)
 	if !exists {
-		context = resources.RequestContext{Id: "NA"}
-	} else {
-		context = context.(resources.RequestContext)
+		context = resources.RequestContext{Id: "NA", ActionName: "NA"}
+	}
+
+	new_context := context.(resources.RequestContext)
+	if new_context.ActionName == "" {
+		new_context.ActionName = "NA"
 	}
-	if l.params.ShowGoid {
-		return fmt.Sprintf("%s:%d", context.(resources.RequestContext).Id, go_id)
+	if new_context.Id == "" {
+		new_context.Id = "NA"
+	}
+
+	if l.params.ShowGoid{
+		return fmt.Sprintf("%s:%d-%s", new_context.Id, go_id, new_context.ActionName)
 	} else {
-		return fmt.Sprintf("%s", context.(resources.RequestContext).Id)
+		return fmt.Sprintf("%s-%s", new_context.Id, new_context.ActionName)
 	}
 }
 
@@ -149,7 +156,7 @@ func getLevel(level Level) logging.Level {
 	}
 }
 
-func GetNewRequestContext() resources.RequestContext {
+func GetNewRequestContext(actionName string) resources.RequestContext{
 	request_uuid := fmt.Sprintf("%s", uuid.NewUUID())
-	return resources.RequestContext{Id: request_uuid}
+    return resources.RequestContext{Id: request_uuid, ActionName : actionName}
 }