@@ -57,6 +57,25 @@ type robotServer struct {
57
57
registry * logging.Registry
58
58
}
59
59
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
+
60
79
func logVersion (logger logging.Logger ) {
61
80
var versionFields []interface {}
62
81
if config .Version != "" {
@@ -72,6 +91,11 @@ func logVersion(logger logging.Logger) {
72
91
}
73
92
}
74
93
94
+ func logStartupInfo (logger logging.Logger ) {
95
+ logVersion (logger )
96
+ logViamEnvVariables (logger )
97
+ }
98
+
75
99
// RunServer is an entry point to starting the web server that can be called by main in a code
76
100
// sample or otherwise be used to initialize the server.
77
101
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)
94
118
config .InitLoggingSettings (logger , argsParsed .Debug )
95
119
96
120
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 )
99
123
return
100
124
}
101
125
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
104
128
defer func () {
105
- if ! versionLogged {
129
+ if ! startupInfoLogged {
106
130
logger .CInfo (ctx , "error starting viam-server, logging version and exiting" )
107
- logVersion (logger )
131
+ logStartupInfo (logger )
108
132
}
109
133
}()
110
134
@@ -160,9 +184,9 @@ func RunServer(ctx context.Context, args []string, _ logging.Logger) (err error)
160
184
161
185
registry .AddAppenderToAll (netAppender )
162
186
}
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
166
190
167
191
server := robotServer {
168
192
logger : logger ,
0 commit comments