upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor synced 2024-09-20 16:35:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Return none zero code when job service exit with error

Browse Source 
replace fmt.Println/logger.Errorf with logger.Fatal(f)
This commit is contained in:
Steven Zou 2018-05-10 14:44:04 +08:00
parent 3ca439c71a
commit f7bc467c99
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/jobservice/main.go
View File

@ -3,7 +3,6 @@ package main
import (
"errors"
"flag"
"fmt"
"github.com/vmware/harbor/src/adminserver/client"
"github.com/vmware/harbor/src/jobservice/config"
@ -22,15 +21,13 @@ func main() {
//Missing config file
if configPath == nil || utils.IsEmptyStr(*configPath) {
fmt.Println("Config file should be specified")
flag.Usage()
return
logger.Fatal("Config file should be specified")
}
//Load configurations
if err := config.DefaultConfig.Load(*configPath, true); err != nil {
fmt.Printf("Failed to load configurations with error: %s\n", err)
return
logger.Fatalf("Failed to load configurations with error: %s\n", err)
}
//Set job context initializer

9
src/jobservice/runtime/bootstrap.go
View File

@ -91,13 +91,14 @@ func (bs *Bootstrap) LoadAndRun() {
logSweeper := logger.NewSweeper(ctx, config.GetLogBasePath(), config.GetLogArchivePeriod())
logSweeper.Start()
//To indicate if any errors occurred
var err error
//Block here
sig := make(chan os.Signal, 1)
signal.Notify(sig, os.Interrupt, syscall.SIGTERM, os.Kill)
select {
case <-sig:
case err := <-rootContext.ErrorChan:
logger.Errorf("Server error:%s\n", err)
case err = <-rootContext.ErrorChan:
}
//Call cancel to send termination signal to other interested parts.
@ -125,6 +126,10 @@ func (bs *Bootstrap) LoadAndRun() {
rootContext.WG.Wait()
close <- true
if err != nil {
logger.Fatalf("Server exit with error: %s\n", err)
}
logger.Infof("Server gracefully exit")
}