9f9e75f508
1) imported glog to third_party (previous commit) 2) add support for third_party/update.sh to update just one pkg 3) search-and-replace: s/log.Printf/glog.Infof/ s/log.Print/glog.Info/ s/log.Fatalf/glog.Fatalf/ s/log.Fatal/glog.Fatal/ 4) convert glog.Info.*, err into glog.Error* Adds some util interfaces to logging and calls them from each cmd, which will set the default log output to write to glog. Pass glog-wrapped Loggers to etcd for logging. Log files will go to /tmp - we should probably follow this up with a default log dir for each cmd. The glog lib is sort of weak in that it only flushes every 30 seconds, so we spin up our own flushing goroutine.
60 lines
1.4 KiB
Go
60 lines
1.4 KiB
Go
/*
|
|
Copyright 2014 Google Inc. All rights reserved.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package util
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"runtime"
|
|
"time"
|
|
|
|
"github.com/golang/glog"
|
|
)
|
|
|
|
// Simply catches a crash and logs an error. Meant to be called via defer.
|
|
func HandleCrash() {
|
|
r := recover()
|
|
if r != nil {
|
|
callers := ""
|
|
for i := 0; true; i++ {
|
|
_, file, line, ok := runtime.Caller(i)
|
|
if !ok {
|
|
break
|
|
}
|
|
callers = callers + fmt.Sprintf("%v:%v\n", file, line)
|
|
}
|
|
glog.Infof("Recovered from panic: %#v (%v)\n%v", r, r, callers)
|
|
}
|
|
}
|
|
|
|
// Loops forever running f every d. Catches any panics, and keeps going.
|
|
func Forever(f func(), period time.Duration) {
|
|
for {
|
|
func() {
|
|
defer HandleCrash()
|
|
f()
|
|
}()
|
|
time.Sleep(period)
|
|
}
|
|
}
|
|
|
|
// Returns o marshalled as a JSON string, ignoring any errors.
|
|
func MakeJSONString(o interface{}) string {
|
|
data, _ := json.Marshal(o)
|
|
return string(data)
|
|
}
|