Skip to content

Use controller logger #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
itamar-marom wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Use controller logger #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b9a2103
fix typo
itamar-marom May 31, 2023
50593db
unified logger + reconciler functions
itamar-marom May 31, 2023
94a5c03
rebase
itamar-marom Jun 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions controllers/druid/druid_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ import (
druidv1alpha1 "github.com/datainfrahq/druid-operator/apis/druid/v1alpha1"
)

var (
logger = ctrl.Log.WithName("controllers").WithName("Druid")
)

// DruidReconciler reconciles a Druid object
type DruidReconciler struct {
client.Client
Expand All @@ -31,7 +35,7 @@ type DruidReconciler struct {
func NewDruidReconciler(mgr ctrl.Manager) *DruidReconciler {
return &DruidReconciler{
Client: mgr.GetClient(),
Log: ctrl.Log.WithName("controllers").WithName("Druid"),
Log: logger,
Scheme: mgr.GetScheme(),
ReconcileWait: LookupReconcileTime(),
Recorder: mgr.GetEventRecorderFor("druid-operator"),
Expand Down Expand Up @@ -69,10 +73,10 @@ func (r *DruidReconciler) Reconcile(ctx context.Context, request reconcile.Reque
return ctrl.Result{}, err
}

// Intialize Emit Events
// Initialize Emit Events
var emitEvent EventEmitter = EmitEventFuncs{r.Recorder}

if err := deployDruidCluster(ctx, r.Client, instance, emitEvent); err != nil {
if err := r.deployDruidCluster(ctx, r.Client, instance, emitEvent); err != nil {
return ctrl.Result{}, err
} else {
return ctrl.Result{RequeueAfter: r.ReconcileWait}, nil
Expand All @@ -96,6 +100,7 @@ func LookupReconcileTime() time.Duration {
} else {
v, err := time.ParseDuration(val)
if err != nil {

logger.Error(err, err.Error())
// Exit Program if not valid
os.Exit(1)
Expand Down
Loading