Skip to content

Commit 2117ac3

Browse files
Kschappachercheukt
andauthored
RSDK-9326 - log important viam env variables (viamrobotics#4602)
Co-authored-by: Cheuk <[email protected]>
1 parent 6345786 commit 2117ac3

File tree

1 file changed

+33
-9
lines changed

1 file changed

+33
-9
lines changed

web/server/entrypoint.go

+33-9
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,25 @@ type robotServer struct {
5757
registry *logging.Registry
5858
}
5959

60+
func logViamEnvVariables(logger logging.Logger) {
61+
var viamEnvVariables []interface{}
62+
if value, exists := os.LookupEnv("VIAM_MODULE_ROOT"); exists {
63+
viamEnvVariables = append(viamEnvVariables, "VIAM_MODULE_ROOT", value)
64+
}
65+
if value, exists := os.LookupEnv("VIAM_RESOURCE_CONFIGURATION_TIMEOUT"); exists {
66+
viamEnvVariables = append(viamEnvVariables, "VIAM_RESOURCE_CONFIGURATION_TIMEOUT", value)
67+
}
68+
if value, exists := os.LookupEnv("VIAM_MODULE_STARTUP_TIMEOUT"); exists {
69+
viamEnvVariables = append(viamEnvVariables, "VIAM_MODULE_STARTUP_TIMEOUT", value)
70+
}
71+
if rutils.PlatformHomeDir() != "" {
72+
viamEnvVariables = append(viamEnvVariables, "HOME", rutils.PlatformHomeDir())
73+
}
74+
if len(viamEnvVariables) != 0 {
75+
logger.Infow("Starting viam-server with following environment variables", viamEnvVariables...)
76+
}
77+
}
78+
6079
func logVersion(logger logging.Logger) {
6180
var versionFields []interface{}
6281
if config.Version != "" {
@@ -72,6 +91,11 @@ func logVersion(logger logging.Logger) {
7291
}
7392
}
7493

94+
func logStartupInfo(logger logging.Logger) {
95+
logVersion(logger)
96+
logViamEnvVariables(logger)
97+
}
98+
7599
// RunServer is an entry point to starting the web server that can be called by main in a code
76100
// sample or otherwise be used to initialize the server.
77101
func RunServer(ctx context.Context, args []string, _ logging.Logger) (err error) {
@@ -94,17 +118,17 @@ func RunServer(ctx context.Context, args []string, _ logging.Logger) (err error)
94118
config.InitLoggingSettings(logger, argsParsed.Debug)
95119

96120
if argsParsed.Version {
97-
// log version here and return if version flag.
98-
logVersion(logger)
121+
// log startup info here and return if version flag.
122+
logStartupInfo(logger)
99123
return
100124
}
101125

102-
// log version locally if server fails and exits while attempting to start up
103-
var versionLogged bool
126+
// log startup info locally if server fails and exits while attempting to start up
127+
var startupInfoLogged bool
104128
defer func() {
105-
if !versionLogged {
129+
if !startupInfoLogged {
106130
logger.CInfo(ctx, "error starting viam-server, logging version and exiting")
107-
logVersion(logger)
131+
logStartupInfo(logger)
108132
}
109133
}()
110134

@@ -160,9 +184,9 @@ func RunServer(ctx context.Context, args []string, _ logging.Logger) (err error)
160184

161185
registry.AddAppenderToAll(netAppender)
162186
}
163-
// log version after netlogger is initialized so it's captured in cloud machine logs.
164-
logVersion(logger)
165-
versionLogged = true
187+
// log startup info after netlogger is initialized so it's captured in cloud machine logs.
188+
logStartupInfo(logger)
189+
startupInfoLogged = true
166190

167191
server := robotServer{
168192
logger: logger,

0 commit comments

Comments
 (0)