Change params.LogRecord.Level to a string.

ericsnowcurrently · ericsnowcurrently · commit dcbeaa907d39 · 2016-06-21T14:38:58.000-06:00
diff --git a/api/logreader/logreader.go b/api/logreader/logreader.go
@@ -112,7 +112,7 @@ func api2record(apiRec params.LogRecord) (logfwd.Record, error) {
 			JujuVersion: version.Current,
 		},
 		Timestamp: apiRec.Time,
-		Level:     apiRec.Level,
+		Level:     apiRec.LoggoLevel(),
 		Message:   apiRec.Message,
 	}
 
diff --git a/api/logreader/logreader_test.go b/api/logreader/logreader_test.go
@@ -31,13 +31,12 @@ var _ = gc.Suite(&LogRecordReaderSuite{})
 func (s *LogRecordReaderSuite) TestLogRecordReader(c *gc.C) {
 	ts := time.Now()
 	apiRec := params.LogRecord{
-		ControllerUUID: "9f484882-2f18-4fd2-967d-db9663db7bea",
-		ModelUUID:      "deadbeef-2f18-4fd2-967d-db9663db7bea",
-		Time:           ts,
-		Module:         "api.logreader.test",
-		Location:       "test.go:42",
-		Level:          loggo.INFO,
-		Message:        "test message",
+		ModelUUID: "deadbeef-2f18-4fd2-967d-db9663db7bea",
+		Time:      ts,
+		Module:    "api.logreader.test",
+		Location:  "test.go:42",
+		Level:     loggo.INFO.String(),
+		Message:   "test message",
 	}
 	stub := &testing.Stub{}
 	stream := mockStream{stub: stub}
@@ -58,9 +57,8 @@ func (s *LogRecordReaderSuite) TestLogRecordReader(c *gc.C) {
 	case logRecord := <-channel:
 		c.Check(logRecord, jc.DeepEquals, logfwd.Record{
 			Origin: logfwd.Origin{
-				ControllerUUID: "9f484882-2f18-4fd2-967d-db9663db7bea",
-				ModelUUID:      "deadbeef-2f18-4fd2-967d-db9663db7bea",
-				JujuVersion:    version.Current,
+				ModelUUID:   "deadbeef-2f18-4fd2-967d-db9663db7bea",
+				JujuVersion: version.Current,
 			},
 			Timestamp: ts,
 			Level:     loggo.INFO,
diff --git a/apiserver/debuglog_db.go b/apiserver/debuglog_db.go
@@ -49,7 +49,7 @@ func handleDebugLogDBRequest(
 					Time:     rec.Time,
 					Module:   rec.Module,
 					Location: rec.Location,
-					Level:    rec.Level,
+					Level:    rec.Level.String(),
 					Message:  rec.Message,
 				}
 				if reqParams.AllModels {
diff --git a/apiserver/logsink_test.go b/apiserver/logsink_test.go
@@ -112,7 +112,7 @@ func (s *logsinkSuite) TestLogging(c *gc.C) {
 		Time:     t0,
 		Module:   "some.where",
 		Location: "foo.go:42",
-		Level:    loggo.INFO,
+		Level:    loggo.INFO.String(),
 		Message:  "all is well",
 	})
 	c.Assert(err, jc.ErrorIsNil)
@@ -122,7 +122,7 @@ func (s *logsinkSuite) TestLogging(c *gc.C) {
 		Time:     t1,
 		Module:   "else.where",
 		Location: "bar.go:99",
-		Level:    loggo.ERROR,
+		Level:    loggo.ERROR.String(),
 		Message:  "oh noes",
 	})
 	c.Assert(err, jc.ErrorIsNil)
diff --git a/apiserver/params/params.go b/apiserver/params/params.go
@@ -756,12 +756,21 @@ type RebootActionResult struct {
 // endpoint.  Single character field names are used for serialisation
 // to keep the size down. These messages are going to be sent a lot.
 type LogRecord struct {
-	ModelUUID string      `json:"o",omitempty`
-	Time      time.Time   `json:"t"`
-	Module    string      `json:"m"`
-	Location  string      `json:"l"`
-	Level     loggo.Level `json:"v"`
-	Message   string      `json:"x"`
+	ModelUUID string    `json:"o",omitempty`
+	Time      time.Time `json:"t"`
+	Module    string    `json:"m"`
+	Location  string    `json:"l"`
+	Level     string    `json:"v"`
+	Message   string    `json:"x"`
+}
+
+// LoggoLevel converts the level string to a loggo.Level.
+func (rec LogRecord) LoggoLevel() loggo.Level {
+	level, ok := loggo.ParseLevel(rec.Level)
+	if !ok {
+		return loggo.UNSPECIFIED
+	}
+	return level
 }
 
 // GetBundleChangesParams holds parameters for making GetBundleChanges calls.
diff --git a/worker/logsender/worker.go b/worker/logsender/worker.go
@@ -32,7 +32,7 @@ func New(logs LogRecordCh, logSenderAPI *logsender.API) worker.Worker {
 					Time:     rec.Time,
 					Module:   rec.Module,
 					Location: rec.Location,
-					Level:    rec.Level,
+					Level:    rec.Level.String(),
 					Message:  rec.Message,
 				})
 				if err != nil {
@@ -57,7 +57,7 @@ func New(logs LogRecordCh, logSenderAPI *logsender.API) worker.Worker {
 					err := logWriter.WriteLog(&params.LogRecord{
 						Time:    rec.Time,
 						Module:  loggerName,
-						Level:   loggo.WARNING,
+						Level:   loggo.WARNING.String(),
 						Message: fmt.Sprintf("%d log messages dropped due to lack of API connectivity", rec.DroppedAfter),
 					})
 					if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ func api2record(apiRec params.LogRecord) (logfwd.Record, error) {`
`112`	`112`	`JujuVersion: version.Current,`
`113`	`113`	`},`
`114`	`114`	`Timestamp: apiRec.Time,`
`115`		`- Level: apiRec.Level,`
	`115`	`+ Level: apiRec.LoggoLevel(),`
`116`	`116`	`Message: apiRec.Message,`
`117`	`117`	`}`
`118`	`118`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ func handleDebugLogDBRequest(`
`49`	`49`	`Time: rec.Time,`
`50`	`50`	`Module: rec.Module,`
`51`	`51`	`Location: rec.Location,`
`52`		`- Level: rec.Level,`
	`52`	`+ Level: rec.Level.String(),`
`53`	`53`	`Message: rec.Message,`
`54`	`54`	`}`
`55`	`55`	`if reqParams.AllModels {`