Nail/fission-src
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use zap for logging (#1112)

Browse Source 
Use zap for logging
This commit is contained in:
Jon Carl
2019-03-14 21:11:15 +05:30
committed by Vishal
parent c717f182b6
commit 0fc864f230
98 changed files with 2031 additions and 1223 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fission/logdb/influxdb.go
+1 -1
View File
@@ -19,7 +19,6 @@ package logdb
import (
"encoding/json"
"fmt"
"log"
"net/http"
"net/url"
"sort"
@@ -30,6 +29,7 @@ import (
influxdbClient "github.com/influxdata/influxdb/client/v2"
"github.com/fission/fission"
"github.com/fission/fission/fission/log"
)
const (
fission/logdb/logdb.go
+2 -4
View File
@@ -17,9 +17,8 @@ limitations under the License.
package logdb
import (
"fmt"
"time"
log "github.com/sirupsen/logrus"
)
const (
@@ -55,6 +54,5 @@ func GetLogDB(dbType string, serverURL string) (LogDatabase, error) {
case INFLUXDB:
return NewInfluxDB(serverURL)
}
log.Fatalf("Log database type is incorrect, now only support %s", INFLUXDB)
return nil, nil
return nil, fmt.Errorf("log database type is incorrect, now only support %s", INFLUXDB)
}
fission/recorder.go
+1 -1
View File
@@ -18,7 +18,6 @@ package main
import (
"fmt"
"log"
"os"
"strings"
"text/tabwriter"
@@ -29,6 +28,7 @@ import (
"github.com/fission/fission"
"github.com/fission/fission/crd"
"github.com/fission/fission/fission/log"
"github.com/fission/fission/fission/util"
)
fission/records.go
+3 -3
View File
@@ -18,12 +18,12 @@ package main
import (
"fmt"
"log"
"os"
"text/tabwriter"
"github.com/urfave/cli"
"github.com/fission/fission/fission/log"
"github.com/fission/fission/fission/util"
"github.com/fission/fission/redis/build/gen"
)
@@ -31,7 +31,7 @@ import (
func recordsView(c *cli.Context) error {
var verbosity int
if c.Bool("v") && c.Bool("vv") {
log.Fatal("Conflicting verbosity levels, use either --v or --vv")
log.Fatal("conflicting verbosity levels, use either --v or --vv")
}
if c.Bool("v") {
verbosity = 1
@@ -47,7 +47,7 @@ func recordsView(c *cli.Context) error {
//Refuse multiple filters for now
if multipleFiltersSpecified(function, trigger, from+to) {
log.Fatal("Maximum of one filter is currently supported, either --function, --trigger, or --from,--to")
log.Fatal("maximum of one filter is currently supported, either --function, --trigger, or --from,--to")
}
if len(function) != 0 {
fission/replay.go
+1 -1
View File
@@ -18,10 +18,10 @@ package main
import (
"fmt"
"log"
"os"
"text/tabwriter"
"github.com/fission/fission/fission/log"
"github.com/fission/fission/fission/util"
"github.com/urfave/cli"
)
fission/support/resources/crd.go
+10 -9
View File
@@ -17,13 +17,14 @@ limitations under the License.
package resources
import (
"log"
"fmt"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"github.com/fission/fission"
"github.com/fission/fission/controller/client"
"github.com/fission/fission/crd"
"github.com/fission/fission/fission/log"
)
const (
@@ -52,7 +53,7 @@ func (res CrdDumper) Dump(dumpDir string) {
case CrdEnvironment:
items, err := res.client.EnvironmentList(metav1.NamespaceAll)
if err != nil {
log.Printf("Error getting %v list: %v", res.crdType, err)
log.Info(fmt.Sprintf("Error getting %v list: %v", res.crdType, err))
return
}
@@ -64,7 +65,7 @@ func (res CrdDumper) Dump(dumpDir string) {
case CrdFunction:
items, err := res.client.FunctionList(metav1.NamespaceAll)
if err != nil {
log.Printf("Error getting %v list: %v", res.crdType, err)
log.Info(fmt.Sprintf("Error getting %v list: %v", res.crdType, err))
return
}
@@ -76,7 +77,7 @@ func (res CrdDumper) Dump(dumpDir string) {
case CrdPackage:
items, err := res.client.PackageList(metav1.NamespaceAll)
if err != nil {
log.Printf("Error getting %v list: %v", res.crdType, err)
log.Info(fmt.Sprintf("Error getting %v list: %v", res.crdType, err))
return
}
@@ -89,7 +90,7 @@ func (res CrdDumper) Dump(dumpDir string) {
case CrdHttpTrigger:
items, err := res.client.HTTPTriggerList(metav1.NamespaceAll)
if err != nil {
log.Printf("Error getting %v list: %v", res.crdType, err)
log.Info(fmt.Sprintf("Error getting %v list: %v", res.crdType, err))
return
}
@@ -101,7 +102,7 @@ func (res CrdDumper) Dump(dumpDir string) {
case CrdKubeWatcher:
items, err := res.client.WatchList(metav1.NamespaceAll)
if err != nil {
log.Printf("Error getting %v list: %v", res.crdType, err)
log.Info(fmt.Sprintf("Error getting %v list: %v", res.crdType, err))
return
}
@@ -116,7 +117,7 @@ func (res CrdDumper) Dump(dumpDir string) {
for _, mqType := range []string{fission.MessageQueueTypeNats, fission.MessageQueueTypeASQ} {
l, err := res.client.MessageQueueTriggerList(mqType, metav1.NamespaceAll)
if err != nil {
log.Printf("Error getting %v list: %v", res.crdType, err)
log.Info(fmt.Sprintf("Error getting %v list: %v", res.crdType, err))
break
}
triggers = append(triggers, l...)
@@ -130,7 +131,7 @@ func (res CrdDumper) Dump(dumpDir string) {
case CrdTimeTrigger:
items, err := res.client.TimeTriggerList(metav1.NamespaceAll)
if err != nil {
log.Printf("Error getting %v list: %v", res.crdType, err)
log.Info(fmt.Sprintf("Error getting %v list: %v", res.crdType, err))
return
}
@@ -140,7 +141,7 @@ func (res CrdDumper) Dump(dumpDir string) {
}
default:
log.Printf("Unknown type: %v", res.crdType)
log.Info(fmt.Sprintf("Unknown type: %v", res.crdType))
}
}
fission/support/resources/kubernetes.go
+13 -13
View File
@@ -21,7 +21,6 @@ import (
"bytes"
"fmt"
"io"
"log"
"path/filepath"
"sync"
@@ -30,6 +29,7 @@ import (
"k8s.io/client-go/kubernetes"
"github.com/fission/fission"
"github.com/fission/fission/fission/log"
)
const (
@@ -52,7 +52,7 @@ func NewKubernetesVersion(clientset *kubernetes.Clientset) Resource {
func (res KubernetesVersion) Dump(dumpDir string) {
serverVer, err := res.client.ServerVersion()
if err != nil {
log.Printf("Error setting up kubernetes client: %v", err)
log.Info(fmt.Sprintf("Error setting up kubernetes client: %v", err))
return
}
@@ -80,7 +80,7 @@ func (res KubernetesObjectDumper) Dump(dumpDir string) {
case KubernetesService:
objs, err := res.client.CoreV1().Services(metav1.NamespaceAll).List(metav1.ListOptions{LabelSelector: res.selector})
if err != nil {
log.Printf("Error getting %v list with selector %v: %v", res.objType, res.selector, err)
log.Info(fmt.Sprintf("Error getting %v list with selector %v: %v", res.objType, res.selector, err))
return
}
@@ -93,7 +93,7 @@ func (res KubernetesObjectDumper) Dump(dumpDir string) {
case KubernetesDeployment:
objs, err := res.client.AppsV1().Deployments(metav1.NamespaceAll).List(metav1.ListOptions{LabelSelector: res.selector})
if err != nil {
log.Printf("Error getting %v list with selector %v: %v", res.objType, res.selector, err)
log.Info(fmt.Sprintf("Error getting %v list with selector %v: %v", res.objType, res.selector, err))
return
}
@@ -105,7 +105,7 @@ func (res KubernetesObjectDumper) Dump(dumpDir string) {
case KubernetesPod:
objs, err := res.client.CoreV1().Pods(metav1.NamespaceAll).List(metav1.ListOptions{LabelSelector: res.selector})
if err != nil {
log.Printf("Error getting %v list with selector %v: %v", res.objType, res.selector, err)
log.Info(fmt.Sprintf("Error getting %v list with selector %v: %v", res.objType, res.selector, err))
return
}
@@ -117,7 +117,7 @@ func (res KubernetesObjectDumper) Dump(dumpDir string) {
case KubernetesHPA:
objs, err := res.client.AutoscalingV2beta1().HorizontalPodAutoscalers(metav1.NamespaceAll).List(metav1.ListOptions{LabelSelector: res.selector})
if err != nil {
log.Printf("Error getting %v list with selector %v: %v", res.objType, res.selector, err)
log.Info(fmt.Sprintf("Error getting %v list with selector %v: %v", res.objType, res.selector, err))
return
}
@@ -129,7 +129,7 @@ func (res KubernetesObjectDumper) Dump(dumpDir string) {
case KubernetesNode:
objs, err := res.client.CoreV1().Nodes().List(metav1.ListOptions{LabelSelector: res.selector})
if err != nil {
log.Printf("Error getting %v list with selector %v: %v", res.objType, res.selector, err)
log.Info(fmt.Sprintf("Error getting %v list with selector %v: %v", res.objType, res.selector, err))
return
}
@@ -142,7 +142,7 @@ func (res KubernetesObjectDumper) Dump(dumpDir string) {
}
default:
log.Printf("Unknown type: %v", res.objType)
log.Info(fmt.Sprintf("Unknown type: %v", res.objType))
}
}
@@ -187,7 +187,7 @@ func (res KubernetesPodLogDumper) Dump(dumpDir string) {
Pods(metav1.NamespaceAll).
List(metav1.ListOptions{LabelSelector: res.labelSelector})
if err != nil {
log.Printf("Error getting controller list: %v", err)
log.Info(fmt.Sprintf("Error getting controller list: %v", err))
return
}
@@ -200,7 +200,7 @@ func (res KubernetesPodLogDumper) Dump(dumpDir string) {
defer wg.Done()
if !fission.IsReadyPod(&pod) {
fmt.Printf("Pod %v is not in ready state, ignore it\n", pod.Name)
log.Info(fmt.Sprintf("Pod %v is not in ready state, ignore it\n", pod.Name))
return
}
@@ -211,7 +211,7 @@ func (res KubernetesPodLogDumper) Dump(dumpDir string) {
stream, err := req.Stream()
if err != nil {
log.Printf("Error streaming logs for pod %v: %v", pod.Name, err)
log.Info(fmt.Sprintf("Error streaming logs for pod %v: %v", pod.Name, err))
return
}
@@ -225,13 +225,13 @@ func (res KubernetesPodLogDumper) Dump(dumpDir string) {
stream.Close()
break
}
log.Printf("Error reading logs from buffer: %v", err)
log.Info(fmt.Sprintf("Error reading logs from buffer: %v", err))
return
}
_, err = buffer.WriteString(string(line) + "\n")
if err != nil {
log.Printf("Error writing bytes to buffer: %v", err)
log.Info(fmt.Sprintf("Error writing bytes to buffer: %v", err))
}
}
fission/support/resources/resource.go
+3 -3
View File
@@ -19,13 +19,13 @@ package resources
import (
"fmt"
"io/ioutil"
"log"
"path/filepath"
"github.com/ghodss/yaml"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"github.com/fission/fission"
"github.com/fission/fission/fission/log"
)
type Resource interface {
@@ -40,7 +40,7 @@ func getFileName(dumpdir string, meta metav1.ObjectMeta) string {
func writeToFile(file string, obj interface{}) {
bs, err := yaml.Marshal(obj)
if err != nil {
log.Printf("Error encoding object: %v", err)
log.Info(fmt.Sprintf("Error encoding object: %v", err))
return
}
@@ -52,6 +52,6 @@ func writeToFile(file string, obj interface{}) {
err = ioutil.WriteFile(file, bs, 0644)
if err != nil {
log.Printf("Error writing file %v: %v", file, err)
log.Info(fmt.Sprintf("Error writing file %v: %v", file, err))
}
}
fission/util/version.go
+2 -1
View File
@@ -3,11 +3,12 @@ package util
import (
"fmt"
yaml "gopkg.in/yaml.v2"
"github.com/fission/fission"
"github.com/fission/fission/controller/client"
"github.com/fission/fission/fission/log"
"github.com/fission/fission/fission/plugin"
yaml "gopkg.in/yaml.v2"
)
// Versions is a container of versions of the client (and its plugins) and server (and its plugins).