Change reboot error messages and timeout

rancher · Feb 23, 2015 · e5192dd · e5192dd
1 parent db94dfa
commit e5192dd
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/cmd/power/power.go b/cmd/power/power.go
@@ -19,26 +19,23 @@ const (
 
 func PowerOff() {
 	if os.Geteuid() != 0 {
-		log.Info("poweroff: Permission Denied")
-		return
+		log.Fatalf("%s: Permission Denied", os.Args[0])
 	}
 	syscall.Sync()
 	reboot(syscall.LINUX_REBOOT_CMD_POWER_OFF)
 }
 
 func Reboot() {
 	if os.Geteuid() != 0 {
-		log.Info("reboot: Permission Denied")
-		return
+		log.Fatalf("%s: Permission Denied", os.Args[0])
 	}
 	syscall.Sync()
 	reboot(syscall.LINUX_REBOOT_CMD_RESTART)
 }
 
 func Halt() {
 	if os.Geteuid() != 0 {
-		log.Info("reboot: Permission Denied")
-		return
+		log.Fatalf("%s: Permission Denied", os.Args[0])
 	}
 	syscall.Sync()
 	reboot(syscall.LINUX_REBOOT_CMD_HALT)
@@ -47,7 +44,7 @@ func Halt() {
 func reboot(code int) {
 	err := shutDownContainers()
 	if err != nil {
-		log.Fatal(err)
+		log.Error(err)
 	}
 	err = syscall.Reboot(code)
 	if err != nil {
@@ -58,7 +55,7 @@ func reboot(code int) {
 func shutDownContainers() error {
 	var err error
 	shutDown := true
-	timeout := uint(0)
+	timeout := uint(2)
 	for i := range os.Args {
 		arg := os.Args[i]
 		if arg == "-f" || arg == "--f" || arg == "--force" {