rancher/norman
1
0
Fork 0
mirror of https://github.com/rancher/norman.git synced 2025-09-08 02:29:28 +00:00
Code Issues Releases Wiki Activity

Move debug log to trace

Browse Source
This commit is contained in:
Sebastiaan van Steenis
2020-03-11 22:48:52 +01:00
committed by Denise
parent a1411b4e62
commit 5c74e1ee1e
5 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
controller/generic_controller.go
View File

@@ -224,14 +224,14 @@ func (g *genericController) sync(ctx context.Context) (retErr error) {
DeleteFunc: g.queueObject, DeleteFunc: g.queueObject,
}) })
logrus.Debugf("Syncing %s Controller", g.name) logrus.Tracef("Syncing %s Controller", g.name)
go g.informer.Run(ctx.Done()) go g.informer.Run(ctx.Done())
if !cache.WaitForCacheSync(ctx.Done(), g.informer.HasSynced) { if !cache.WaitForCacheSync(ctx.Done(), g.informer.HasSynced) {
return fmt.Errorf("failed to sync controller %s", g.name) return fmt.Errorf("failed to sync controller %s", g.name)
} }
logrus.Debugf("Syncing %s Controller Done", g.name) logrus.Tracef("Syncing %s Controller Done", g.name)
g.synced = true g.synced = true
return nil return nil
@@ -300,7 +300,7 @@ func (g *genericController) processNextWorkItem() bool {
} }
if _, ok := checkErr.(*ForgetError); err == nil || ok { if _, ok := checkErr.(*ForgetError); err == nil || ok {
if ok { if ok {
logrus.Debugf("%v %v completed with dropped err: %v", g.name, key, err) logrus.Tracef("%v %v completed with dropped err: %v", g.name, key, err)
} }
g.queue.Forget(key) g.queue.Forget(key)
return true return true
@@ -381,7 +381,7 @@ func (g *genericController) syncHandler(key interface{}) (err error) {
continue continue
} }
logrus.Debugf("%s calling handler %s %s", g.name, handler.name, s) logrus.Tracef("%s calling handler %s %s", g.name, handler.name, s)
metrics.IncTotalHandlerExecution(g.name, handler.name) metrics.IncTotalHandlerExecution(g.name, handler.name)
var newObj interface{} var newObj interface{}
if newObj, err = handler.handler(s, obj); err != nil { if newObj, err = handler.handler(s, obj); err != nil {

16
objectclient/object_client.go
View File

@@ -127,7 +127,7 @@ func (p *ObjectClient) Create(o runtime.Object) (runtime.Object, error) {
} }
} }
result := p.Factory.Object() result := p.Factory.Object()
logrus.Debugf("REST CREATE %s/%s/%s/%s/%s", p.getAPIPrefix(), p.gvk.Group, p.gvk.Version, ns, p.resource.Name) logrus.Tracef("REST CREATE %s/%s/%s/%s/%s", p.getAPIPrefix(), p.gvk.Group, p.gvk.Version, ns, p.resource.Name)
err := p.restClient.Post(). err := p.restClient.Post().
Prefix(p.getAPIPrefix(), p.gvk.Group, p.gvk.Version). Prefix(p.getAPIPrefix(), p.gvk.Group, p.gvk.Version).
NamespaceIfScoped(ns, p.resource.Namespaced). NamespaceIfScoped(ns, p.resource.Namespaced).
@@ -151,7 +151,7 @@ func (p *ObjectClient) GetNamespaced(namespace, name string, opts metav1.GetOpti
Name(name). Name(name).
Do(). Do().
Into(result) Into(result)
logrus.Debugf("REST GET %s/%s/%s/%s/%s/%s", p.getAPIPrefix(), p.gvk.Group, p.gvk.Version, namespace, p.resource.Name, name) logrus.Tracef("REST GET %s/%s/%s/%s/%s/%s", p.getAPIPrefix(), p.gvk.Group, p.gvk.Version, namespace, p.resource.Name, name)
return result, err return result, err
} }
@@ -166,7 +166,7 @@ func (p *ObjectClient) Get(name string, opts metav1.GetOptions) (runtime.Object,
Name(name). Name(name).
Do(). Do().
Into(result) Into(result)
logrus.Debugf("REST GET %s/%s/%s/%s/%s/%s", p.getAPIPrefix(), p.gvk.Group, p.gvk.Version, p.ns, p.resource.Name, name) logrus.Tracef("REST GET %s/%s/%s/%s/%s/%s", p.getAPIPrefix(), p.gvk.Group, p.gvk.Version, p.ns, p.resource.Name, name)
return result, err return result, err
} }
@@ -179,7 +179,7 @@ func (p *ObjectClient) Update(name string, o runtime.Object) (runtime.Object, er
if len(name) == 0 { if len(name) == 0 {
return result, errors.New("object missing name") return result, errors.New("object missing name")
} }
logrus.Debugf("REST UPDATE %s/%s/%s/%s/%s/%s", p.getAPIPrefix(), p.gvk.Group, p.gvk.Version, ns, p.resource.Name, name) logrus.Tracef("REST UPDATE %s/%s/%s/%s/%s/%s", p.getAPIPrefix(), p.gvk.Group, p.gvk.Version, ns, p.resource.Name, name)
err := p.restClient.Put(). err := p.restClient.Put().
Prefix(p.getAPIPrefix(), p.gvk.Group, p.gvk.Version). Prefix(p.getAPIPrefix(), p.gvk.Group, p.gvk.Version).
NamespaceIfScoped(ns, p.resource.Namespaced). NamespaceIfScoped(ns, p.resource.Namespaced).
@@ -197,7 +197,7 @@ func (p *ObjectClient) DeleteNamespaced(namespace, name string, opts *metav1.Del
if namespace != "" { if namespace != "" {
req = req.Namespace(namespace) req = req.Namespace(namespace)
} }
logrus.Debugf("REST DELETE %s/%s/%s/%s/%s/%s", p.getAPIPrefix(), p.gvk.Group, p.gvk.Version, namespace, p.resource.Name, name) logrus.Tracef("REST DELETE %s/%s/%s/%s/%s/%s", p.getAPIPrefix(), p.gvk.Group, p.gvk.Version, namespace, p.resource.Name, name)
return req.Resource(p.resource.Name). return req.Resource(p.resource.Name).
Name(name). Name(name).
Body(opts). Body(opts).
@@ -206,7 +206,7 @@ func (p *ObjectClient) DeleteNamespaced(namespace, name string, opts *metav1.Del
} }
func (p *ObjectClient) Delete(name string, opts *metav1.DeleteOptions) error { func (p *ObjectClient) Delete(name string, opts *metav1.DeleteOptions) error {
logrus.Debugf("REST DELETE %s/%s/%s/%s/%s/%s", p.getAPIPrefix(), p.gvk.Group, p.gvk.Version, p.ns, p.resource.Name, name) logrus.Tracef("REST DELETE %s/%s/%s/%s/%s/%s", p.getAPIPrefix(), p.gvk.Group, p.gvk.Version, p.ns, p.resource.Name, name)
return p.restClient.Delete(). return p.restClient.Delete().
Prefix(p.getAPIPrefix(), p.gvk.Group, p.gvk.Version). Prefix(p.getAPIPrefix(), p.gvk.Group, p.gvk.Version).
NamespaceIfScoped(p.ns, p.resource.Namespaced). NamespaceIfScoped(p.ns, p.resource.Namespaced).
@@ -219,7 +219,7 @@ func (p *ObjectClient) Delete(name string, opts *metav1.DeleteOptions) error {
func (p *ObjectClient) List(opts metav1.ListOptions) (runtime.Object, error) { func (p *ObjectClient) List(opts metav1.ListOptions) (runtime.Object, error) {
result := p.Factory.List() result := p.Factory.List()
logrus.Debugf("REST LIST %s/%s/%s/%s/%s", p.getAPIPrefix(), p.gvk.Group, p.gvk.Version, p.ns, p.resource.Name) logrus.Tracef("REST LIST %s/%s/%s/%s/%s", p.getAPIPrefix(), p.gvk.Group, p.gvk.Version, p.ns, p.resource.Name)
return result, p.restClient.Get(). return result, p.restClient.Get().
Prefix(p.getAPIPrefix(), p.gvk.Group, p.gvk.Version). Prefix(p.getAPIPrefix(), p.gvk.Group, p.gvk.Version).
NamespaceIfScoped(p.ns, p.resource.Namespaced). NamespaceIfScoped(p.ns, p.resource.Namespaced).
@@ -231,7 +231,7 @@ func (p *ObjectClient) List(opts metav1.ListOptions) (runtime.Object, error) {
func (p *ObjectClient) ListNamespaced(namespace string, opts metav1.ListOptions) (runtime.Object, error) { func (p *ObjectClient) ListNamespaced(namespace string, opts metav1.ListOptions) (runtime.Object, error) {
result := p.Factory.List() result := p.Factory.List()
logrus.Debugf("REST LIST %s/%s/%s/%s/%s", p.getAPIPrefix(), p.gvk.Group, p.gvk.Version, namespace, p.resource.Name) logrus.Tracef("REST LIST %s/%s/%s/%s/%s", p.getAPIPrefix(), p.gvk.Group, p.gvk.Version, namespace, p.resource.Name)
return result, p.restClient.Get(). return result, p.restClient.Get().
Prefix(p.getAPIPrefix(), p.gvk.Group, p.gvk.Version). Prefix(p.getAPIPrefix(), p.gvk.Group, p.gvk.Version).
NamespaceIfScoped(namespace, p.resource.Namespaced). NamespaceIfScoped(namespace, p.resource.Namespaced).

2
pkg/subscribe/handler.go
View File

@@ -157,7 +157,7 @@ func streamStore(ctx context.Context, eg *errgroup.Group, apiContext *types.APIC
return err return err
} }
logrus.Debugf("watching %s", schema.ID) logrus.Tracef("watching %s", schema.ID)
for e := range events { for e := range events {
result <- e result <- e

10
store/proxy/proxy_store.go
View File

@@ -128,7 +128,7 @@ func (s *Store) getUser(apiContext *types.APIContext) string {
func (s *Store) doAuthed(apiContext *types.APIContext, request *rest.Request) rest.Result { func (s *Store) doAuthed(apiContext *types.APIContext, request *rest.Request) rest.Result {
start := time.Now() start := time.Now()
defer func() { defer func() {
logrus.Debug("GET: ", time.Now().Sub(start), s.resourcePlural) logrus.Tracef("GET: %v, %v", time.Now().Sub(start), s.resourcePlural)
}() }()
for _, header := range authHeaders { for _, header := range authHeaders {
@@ -251,7 +251,7 @@ func (s *Store) retryList(namespace string, apiContext *types.APIContext) (*unst
start := time.Now() start := time.Now()
resultList = &unstructured.UnstructuredList{} resultList = &unstructured.UnstructuredList{}
err = req.Do().Into(resultList) err = req.Do().Into(resultList)
logrus.Debugf("LIST: %v, %v", time.Now().Sub(start), s.resourcePlural) logrus.Tracef("LIST: %v, %v", time.Now().Sub(start), s.resourcePlural)
if err != nil { if err != nil {
if i < 2 && strings.Contains(err.Error(), "Client.Timeout exceeded") { if i < 2 && strings.Contains(err.Error(), "Client.Timeout exceeded") {
logrus.Infof("Error on LIST %v: %v. Attempt: %v. Retrying", s.resourcePlural, err, i+1) logrus.Infof("Error on LIST %v: %v. Attempt: %v. Retrying", s.resourcePlural, err, i+1)
@@ -307,7 +307,7 @@ func (s *Store) realWatch(apiContext *types.APIContext, schema *types.Schema, op
watchingContext, cancelWatchingContext := context.WithCancel(apiContext.Request.Context()) watchingContext, cancelWatchingContext := context.WithCancel(apiContext.Request.Context())
go func() { go func() {
<-watchingContext.Done() <-watchingContext.Done()
logrus.Debugf("stopping watcher for %s", schema.ID) logrus.Tracef("stopping watcher for %s", schema.ID)
watcher.Stop() watcher.Stop()
}() }()
@@ -316,7 +316,7 @@ func (s *Store) realWatch(apiContext *types.APIContext, schema *types.Schema, op
for event := range watcher.ResultChan() { for event := range watcher.ResultChan() {
if data, ok := event.Object.(*metav1.Status); ok { if data, ok := event.Object.(*metav1.Status); ok {
// just logging it, keeping the same behavior as before // just logging it, keeping the same behavior as before
logrus.Debugf("watcher status for %s: %s", schema.ID, data.Message) logrus.Tracef("watcher status for %s: %s", schema.ID, data.Message)
} else { } else {
data := event.Object.(*unstructured.Unstructured) data := event.Object.(*unstructured.Unstructured)
s.fromInternal(apiContext, schema, data.Object) s.fromInternal(apiContext, schema, data.Object)
@@ -326,7 +326,7 @@ func (s *Store) realWatch(apiContext *types.APIContext, schema *types.Schema, op
result <- data.Object result <- data.Object
} }
} }
logrus.Debugf("closing watcher for %s", schema.ID) logrus.Tracef("closing watcher for %s", schema.ID)
close(result) close(result)
cancelWatchingContext() cancelWatchingContext()
}() }()

10
types/reflection.go
View File

@@ -153,11 +153,11 @@ func (s *Schemas) importType(version *APIVersion, t reflect.Type, overrides ...r
} }
if s, ok := s.processingTypes[t]; ok { if s, ok := s.processingTypes[t]; ok {
logrus.Debugf("Returning half built schema %s for %v", typeName, t) logrus.Tracef("Returning half built schema %s for %v", typeName, t)
return s, nil return s, nil
} }
logrus.Debugf("Inspecting schema %s for %v", typeName, t) logrus.Tracef("Inspecting schema %s for %v", typeName, t)
schema, err := s.newSchemaFromType(version, t, typeName) schema, err := s.newSchemaFromType(version, t, typeName)
if err != nil { if err != nil {
@@ -274,11 +274,11 @@ func (s *Schemas) readFields(schema *Schema, t reflect.Type) error {
} }
if blacklistNames[fieldName] { if blacklistNames[fieldName] {
logrus.Debugf("Ignoring blacklisted field %s.%s for %v", schema.ID, fieldName, field) logrus.Tracef("Ignoring blacklisted field %s.%s for %v", schema.ID, fieldName, field)
continue continue
} }
logrus.Debugf("Inspecting field %s.%s for %v", schema.ID, fieldName, field) logrus.Tracef("Inspecting field %s.%s for %v", schema.ID, fieldName, field)
schemaField := Field{ schemaField := Field{
Create: true, Create: true,
@@ -336,7 +336,7 @@ func (s *Schemas) readFields(schema *Schema, t reflect.Type) error {
} }
} }
logrus.Debugf("Setting field %s.%s: %#v", schema.ID, fieldName, schemaField) logrus.Tracef("Setting field %s.%s: %#v", schema.ID, fieldName, schemaField)
schema.ResourceFields[fieldName] = schemaField schema.ResourceFields[fieldName] = schemaField
} }