Merge pull request #16754 from travisn/logger-names

core: Shorten the logger names
This commit is contained in:
Travis Nielsen authored and GitHub committed 2025-11-21 14:23:25 -07:00
commit d0ea4d7ec8
13 files changed
+14 -14

No files matched your search

+1 -1
View File
@@ -55,7 +55,7 @@ const (
controllerName = "ceph-client-controller"
)
var logger = capnslog.NewPackageLogger("github.com/rook/rook", controllerName)
var logger = capnslog.NewPackageLogger("github.com/rook/rook", "client-controller")
// Sets the type meta for the controller main object
var controllerTypeMeta = metav1.TypeMeta{
+1 -1
View File
@@ -67,7 +67,7 @@ const (
)
var (
logger = capnslog.NewPackageLogger("github.com/rook/rook", controllerName)
logger = capnslog.NewPackageLogger("github.com/rook/rook", "cluster-controller")
// disallowedHostDirectories directories which are not allowed to be used
disallowedHostDirectories = []string{"/etc/ceph", "/rook", "/var/log/ceph"}
)
@@ -52,7 +52,7 @@ import (
)
var (
logger = capnslog.NewPackageLogger("github.com/rook/rook", controllerName)
logger = capnslog.NewPackageLogger("github.com/rook/rook", "nodedaemon")
// Implement reconcile.Reconciler so the controller can reconcile objects
_ reconcile.Reconciler = &ReconcileNode{}
+1 -1
View File
@@ -52,7 +52,7 @@ const (
controllerName = "ceph-rbd-mirror-controller"
)
var logger = capnslog.NewPackageLogger("github.com/rook/rook", controllerName)
var logger = capnslog.NewPackageLogger("github.com/rook/rook", "rbd-mirror-controller")
// List of object resources to watch by the controller
var objectsToWatch = []client.Object{
+2 -2
View File
@@ -687,11 +687,11 @@ func (c *clientCluster) getCephCluster() *cephv1.CephCluster {
err := c.client.List(context.TODO(), clusterList, client.InNamespace(c.namespace))
if err != nil {
logger.Debugf("%q: failed to fetch CephCluster %v", controllerName, err)
logger.Debugf("failed to fetch CephCluster %v", err)
return &cephv1.CephCluster{}
}
if len(clusterList.Items) == 0 {
logger.Debugf("%q: no CephCluster resource found in namespace %q", controllerName, c.namespace)
logger.Debugf("no CephCluster resource found in namespace %q", c.namespace)
return &cephv1.CephCluster{}
}
@@ -45,7 +45,7 @@ const (
)
var (
logger = capnslog.NewPackageLogger("github.com/rook/rook", controllerName)
logger = capnslog.NewPackageLogger("github.com/rook/rook", "disruption")
// Implement reconcile.Reconciler so the controller can reconcile objects
_ reconcile.Reconciler = &ReconcileClusterDisruption{}
+1 -1
View File
@@ -53,7 +53,7 @@ const (
controllerName = "ceph-file-controller"
)
var logger = capnslog.NewPackageLogger("github.com/rook/rook", controllerName)
var logger = capnslog.NewPackageLogger("github.com/rook/rook", "file-controller")
// List of object resources to watch by the controller
var objectsToWatch = []client.Object{
+1 -1
View File
@@ -51,7 +51,7 @@ const (
controllerName = "ceph-filesystem-mirror-controller"
)
var logger = capnslog.NewPackageLogger("github.com/rook/rook", controllerName)
var logger = capnslog.NewPackageLogger("github.com/rook/rook", "cephfs-mirror-controller")
// List of object resources to watch by the controller
var objectsToWatch = []client.Object{
+1 -1
View File
@@ -53,7 +53,7 @@ const (
controllerName = "ceph-nfs-controller"
)
var logger = capnslog.NewPackageLogger("github.com/rook/rook", controllerName)
var logger = capnslog.NewPackageLogger("github.com/rook/rook", "nfs-controller")
// List of object resources to watch by the controller
var objectsToWatch = []client.Object{
+1 -1
View File
@@ -62,7 +62,7 @@ const (
var waitForRequeueIfObjectStoreNotReady = reconcile.Result{Requeue: true, RequeueAfter: 10 * time.Second}
var logger = capnslog.NewPackageLogger("github.com/rook/rook", controllerName)
var logger = capnslog.NewPackageLogger("github.com/rook/rook", "object-controller")
// List of object resources to watch by the controller
var objectsToWatch = []client.Object{
+1 -1
View File
@@ -61,7 +61,7 @@ const (
// newMultisiteAdminOpsCtxFunc help us mocking the admin ops API client in unit test
var newMultisiteAdminOpsCtxFunc = object.NewMultisiteAdminOpsContext
var logger = capnslog.NewPackageLogger("github.com/rook/rook", controllerName)
var logger = capnslog.NewPackageLogger("github.com/rook/rook", "object-user-controller")
// Sets the type meta for the controller main object
var controllerTypeMeta = metav1.TypeMeta{
+1 -1
View File
@@ -67,7 +67,7 @@ var createObjectStorePoolsFunc = object.CreateObjectStorePools
// allow this to be overridden for unit tests
var commitConfigChangesFunc = object.CommitConfigChanges
var logger = capnslog.NewPackageLogger("github.com/rook/rook", controllerName)
var logger = capnslog.NewPackageLogger("github.com/rook/rook", "zone-controller")
// Sets the type meta for the controller main object
var controllerTypeMeta = metav1.TypeMeta{
@@ -53,7 +53,7 @@ const (
var waitForRequeueIfObjectRealmNotReady = reconcile.Result{Requeue: true, RequeueAfter: 10 * time.Second}
var logger = capnslog.NewPackageLogger("github.com/rook/rook", controllerName)
var logger = capnslog.NewPackageLogger("github.com/rook/rook", "zonegroup-controller")
// Sets the type meta for the controller main object
var controllerTypeMeta = metav1.TypeMeta{