Commit 1077109e authored by Taylor Gerring's avatar Taylor Gerring

Add JsonLogger type

parent ed7d7b40
......@@ -44,6 +44,7 @@ type Config struct {
}
var logger = ethlogger.NewLogger("SERV")
var jsonlogger = ethlogger.NewJsonLogger()
type Ethereum struct {
// Channel for shutting down the ethereum
......@@ -221,6 +222,14 @@ func (s *Ethereum) MaxPeers() int {
// Start the ethereum
func (s *Ethereum) Start(seed bool) error {
evd := map[string]interface{}{
"version_string": s.ClientIdentity().String(),
"guid": ethutil.Bytes2Hex(s.ClientIdentity().Pubkey()),
"level": "debug",
"coinbase": ethutil.Bytes2Hex(s.KeyManager().Address()),
"eth_version": ProtocolVersion,
}
jsonlogger.Log("starting", evd)
err := s.net.Start()
if err != nil {
return err
......
......@@ -13,8 +13,10 @@ logging of mutable state.
package logger
import (
"encoding/json"
"fmt"
"os"
"time"
)
type LogLevel uint32
......@@ -112,3 +114,27 @@ func (logger *Logger) Fatalf(format string, v ...interface{}) {
Flush()
os.Exit(0)
}
type JsonLogger struct{}
func NewJsonLogger() *JsonLogger {
return &JsonLogger{}
}
func (logger *JsonLogger) Log(msgname string, dict map[string]interface{}) {
if _, ok := dict["ts"]; !ok {
dict["ts"] = time.Now().Local().Format(time.RFC3339Nano)
}
// FIX
if _, ok := dict["level"]; !ok {
dict["level"] = "debug"
}
obj := map[string]interface{}{
msgname: dict,
}
jsontxt, _ := json.Marshal(obj)
logMessageC <- message{JsonLevel, fmt.Sprintf("%s", jsontxt)}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment