Skip to content

Commit e2030bc

Browse files
committed
#286 Savepoint
1 parent 537d650 commit e2030bc

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

cmd/root.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,22 @@ For more information, visit https://github.com/senzing-garage/serve-grpc
2929

3030
var ContextVariablesForMultiPlatform = []option.ContextVariable{
3131
option.Configuration,
32-
option.DatabaseUrl,
32+
option.DatabaseURL,
3333
option.EnableAll,
3434
option.EnableSzConfig,
3535
option.EnableSzConfigManager,
3636
option.EnableSzDiagnostic,
3737
option.EnableSzEngine,
3838
option.EnableSzProduct,
39-
option.EngineConfigurationJson,
39+
option.EngineConfigurationJSON,
4040
option.EngineLogLevel,
4141
option.EngineModuleName,
4242
option.GrpcPort,
43-
option.GrpcUrl,
44-
option.HttpPort,
43+
option.GrpcURL,
44+
option.HTTPPort,
4545
option.LogLevel,
4646
option.ObserverOrigin,
47-
option.ObserverUrl,
47+
option.ObserverURL,
4848
}
4949

5050
var ContextVariables = append(ContextVariablesForMultiPlatform, ContextVariablesForOsArch...)
@@ -95,7 +95,7 @@ func RunE(_ *cobra.Command, _ []string) error {
9595
EnableSzProduct: viper.GetBool(option.EnableSzProduct.Arg),
9696
LogLevelName: viper.GetString(option.LogLevel.Arg),
9797
ObserverOrigin: viper.GetString(option.ObserverOrigin.Arg),
98-
ObserverUrl: viper.GetString(option.ObserverUrl.Arg),
98+
ObserverUrl: viper.GetString(option.ObserverURL.Arg),
9999
Port: viper.GetInt(option.GrpcPort.Arg),
100100
SenzingSettings: senzingSettings,
101101
SenzingInstanceName: viper.GetString(option.EngineModuleName.Arg),

grpcserver/grpcserver_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
)
1717

1818
var (
19-
localLogger logging.LoggingInterface
19+
localLogger logging.Logging
2020
)
2121

2222
// ----------------------------------------------------------------------------
@@ -88,7 +88,7 @@ func setupSenzingConfig(ctx context.Context, instanceName string, settings strin
8888
return localLogger.NewError(5913, err)
8989
}
9090

91-
err = szConfigManager.SetDefaultConfigId(ctx, configID)
91+
err = szConfigManager.SetDefaultConfigID(ctx, configID)
9292
if err != nil {
9393
return localLogger.NewError(5914, err)
9494
}

szengineserver/szengineserver.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -600,13 +600,13 @@ func (server *SzEngineServer) WhyRecords(ctx context.Context, request *szpb.WhyR
600600
// --- Logging ----------------------------------------------------------------
601601

602602
// Get the Logger singleton.
603-
func (server *SzEngineServer) getLogger() logging.LoggingInterface {
603+
func (server *SzEngineServer) getLogger() logging.Logging {
604604
var err error = nil
605605
if server.logger == nil {
606606
options := []interface{}{
607607
&logging.OptionCallerSkip{Value: 3},
608608
}
609-
server.logger, err = logging.NewSenzingToolsLogger(ComponentId, IdMessages, options...)
609+
server.logger, err = logging.NewSenzingLogger(ComponentId, IdMessages, options...)
610610
if err != nil {
611611
panic(err)
612612
}

0 commit comments

Comments
 (0)