Skip to content

Commit

Permalink
Added -container flag as default for docker image
Browse files Browse the repository at this point in the history
  • Loading branch information
galexrt committed Oct 4, 2017
1 parent 97ad542 commit 232402a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ ADD .build/linux-amd64/dellhw_exporter /bin/dellhw_exporter

ENTRYPOINT ["/bin/dellhw_exporter"]

#CMD srvadmin-services.sh restart && tail -f /opt/dell/srvadmin/var/log/openmanage/dcsys64.xml
CMD ["-container"]
7 changes: 4 additions & 3 deletions cmd/dellhw_exporter/dellhw_exporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ func main() {
log.Infoln("Build context", version.BuildContext())

if opts.container {
log.Infoln("Starting srvadmin-services")
log.Infoln("Starting srvadmin-services ...")
cmd := exec.Command("/opt/dell/srvadmin/sbin/srvadmin-services.sh", "start")
if err := cmd.Start(); err != nil {
log.Fatal(err)
Expand All @@ -204,6 +204,7 @@ func main() {
log.Fatal(err)
}
timer.Stop()
log.Infoln("Started srvadmin-services.")
}

omrOpts := &omreport.Options{
Expand Down Expand Up @@ -242,8 +243,8 @@ func main() {
</body>
</html>`))
})
err = http.ListenAndServe(opts.metricsAddr, nil)
if err != nil {

if err := http.ListenAndServe(opts.metricsAddr, nil); err != nil {
log.Fatal(err)
}
}

0 comments on commit 232402a

Please sign in to comment.