Skip to content

Commit

Permalink
Merge branch 'main' into controllerserver-logging
Browse files Browse the repository at this point in the history
  • Loading branch information
Khaja Omer committed Sep 6, 2024
2 parents 8c3e0f4 + eea2f43 commit 1da4964
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions internal/driver/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,13 @@ func GetLinodeDriver(ctx context.Context) *LinodeDriver {
log, _, done := logger.GetLogger(ctx).WithMethod("GetLinodeDriver")
defer done()

log.V(4).Info("Creating LinodeDriver")
log.V(2).Info("Creating LinodeDriver")
driver := &LinodeDriver{
vcap: VolumeCapabilityAccessModes(),
cscap: ControllerServiceCapabilities(),
nscap: NodeServiceCapabilities(),
}
log.V(4).Info("LinodeDriver created successfully")
log.V(2).Info("LinodeDriver created successfully")
return driver
}

Expand All @@ -86,7 +86,7 @@ func (linodeDriver *LinodeDriver) SetupLinodeDriver(
log, ctx, done := logger.GetLogger(ctx).WithMethod("SetupLinodeDriver")
defer done()

log.V(4).Info("Setting up LinodeDriver")
log.V(2).Info("Setting up LinodeDriver")

if name == "" {
return fmt.Errorf("driver name missing")
Expand All @@ -108,7 +108,7 @@ func (linodeDriver *LinodeDriver) SetupLinodeDriver(
}
linodeDriver.volumeLabelPrefix = volumeLabelPrefix

log.V(3).Info("Setting up RPC Servers")
log.V(2).Info("Setting up RPC Servers")
linodeDriver.ns, err = NewNodeServer(ctx, linodeDriver, mounter, deviceUtils, linodeClient, metadata, encrypt)
if err != nil {
return fmt.Errorf("new node server: %w", err)
Expand All @@ -125,7 +125,7 @@ func (linodeDriver *LinodeDriver) SetupLinodeDriver(
}
linodeDriver.cs = cs

log.V(4).Info("LinodeDriver setup completed successfully")
log.V(2).Info("LinodeDriver setup completed successfully")
return nil
}

Expand Down Expand Up @@ -154,7 +154,7 @@ func (linodeDriver *LinodeDriver) Run(ctx context.Context, endpoint string) {
log, _, done := logger.GetLogger(ctx).WithMethod("Run")
defer done()

log.V(4).Info("Starting LinodeDriver", "name", linodeDriver.name)
log.V(2).Info("Starting LinodeDriver", "name", linodeDriver.name)
if len(linodeDriver.volumeLabelPrefix) > 0 {
log.V(4).Info("BS Volume Prefix", "prefix", linodeDriver.volumeLabelPrefix)
}
Expand All @@ -163,10 +163,10 @@ func (linodeDriver *LinodeDriver) Run(ctx context.Context, endpoint string) {
linodeDriver.ready = true
linodeDriver.readyMu.Unlock()

log.V(3).Info("Starting non-blocking GRPC server")
log.V(2).Info("Starting non-blocking GRPC server")
s := NewNonBlockingGRPCServer()
s.Start(endpoint, linodeDriver.ids, linodeDriver.cs, linodeDriver.ns)
log.V(3).Info("GRPC server started successfully")
log.V(2).Info("GRPC server started successfully")
s.Wait()
log.V(4).Info("LinodeDriver run completed")
log.V(2).Info("LinodeDriver run completed")
}

0 comments on commit 1da4964

Please sign in to comment.