Skip to content

Commit 232402a

Browse files
committed
Added -container flag as default for docker image
1 parent 97ad542 commit 232402a

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ ADD .build/linux-amd64/dellhw_exporter /bin/dellhw_exporter
2121

2222
ENTRYPOINT ["/bin/dellhw_exporter"]
2323

24-
#CMD srvadmin-services.sh restart && tail -f /opt/dell/srvadmin/var/log/openmanage/dcsys64.xml
24+
CMD ["-container"]

cmd/dellhw_exporter/dellhw_exporter.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ func main() {
191191
log.Infoln("Build context", version.BuildContext())
192192

193193
if opts.container {
194-
log.Infoln("Starting srvadmin-services")
194+
log.Infoln("Starting srvadmin-services ...")
195195
cmd := exec.Command("/opt/dell/srvadmin/sbin/srvadmin-services.sh", "start")
196196
if err := cmd.Start(); err != nil {
197197
log.Fatal(err)
@@ -204,6 +204,7 @@ func main() {
204204
log.Fatal(err)
205205
}
206206
timer.Stop()
207+
log.Infoln("Started srvadmin-services.")
207208
}
208209

209210
omrOpts := &omreport.Options{
@@ -242,8 +243,8 @@ func main() {
242243
</body>
243244
</html>`))
244245
})
245-
err = http.ListenAndServe(opts.metricsAddr, nil)
246-
if err != nil {
246+
247+
if err := http.ListenAndServe(opts.metricsAddr, nil); err != nil {
247248
log.Fatal(err)
248249
}
249250
}

0 commit comments

Comments
 (0)