log.Fatal already do Exit(1)

This commit is contained in:
nemunaire 2016-06-25 16:42:35 +02:00 committed by Pierre-Olivier Mercier
parent ad95ce6f16
commit fc0834ea4c
2 changed files with 0 additions and 11 deletions

View file

@ -36,38 +36,29 @@ func main() {
log.Println("Checking paths...") log.Println("Checking paths...")
if staticDir, err = filepath.Abs("./static/"); err != nil { if staticDir, err = filepath.Abs("./static/"); err != nil {
log.Fatal(err) log.Fatal(err)
os.Exit(1)
} }
if fic.FilesDir, err = filepath.Abs(fic.FilesDir); err != nil { if fic.FilesDir, err = filepath.Abs(fic.FilesDir); err != nil {
log.Fatal(err) log.Fatal(err)
os.Exit(1)
} }
if PKIDir, err = filepath.Abs(PKIDir); err != nil { if PKIDir, err = filepath.Abs(PKIDir); err != nil {
log.Fatal(err) log.Fatal(err)
os.Exit(1)
} }
if SubmissionDir, err = filepath.Abs(SubmissionDir); err != nil { if SubmissionDir, err = filepath.Abs(SubmissionDir); err != nil {
log.Fatal(err) log.Fatal(err)
os.Exit(1)
} }
if fic.FilesDir, err = filepath.Abs(fic.FilesDir); err != nil { if fic.FilesDir, err = filepath.Abs(fic.FilesDir); err != nil {
log.Fatal(err) log.Fatal(err)
os.Exit(1)
} }
log.Println("Opening database...") log.Println("Opening database...")
if err := fic.DBInit(fmt.Sprintf("%s?parseTime=true", *dsn)); err != nil { if err := fic.DBInit(fmt.Sprintf("%s?parseTime=true", *dsn)); err != nil {
log.Fatal("Cannot open the database: ", err) log.Fatal("Cannot open the database: ", err)
os.Exit(1)
} }
defer fic.DBClose() defer fic.DBClose()
log.Println("Creating database...") log.Println("Creating database...")
if err := fic.DBCreate(); err != nil { if err := fic.DBCreate(); err != nil {
log.Fatal("Cannot create database: ", err) log.Fatal("Cannot create database: ", err)
os.Exit(1)
} }
os.Chdir(PKIDir) os.Chdir(PKIDir)

View file

@ -62,8 +62,6 @@ func main() {
log.Println("Opening DB...") log.Println("Opening DB...")
if err := fic.DBInit(fmt.Sprintf("%s?parseTime=true", *dsn)); err != nil { if err := fic.DBInit(fmt.Sprintf("%s?parseTime=true", *dsn)); err != nil {
log.Fatal("Cannot open the database: ", err) log.Fatal("Cannot open the database: ", err)
os.Exit(1)
} }
defer fic.DBClose() defer fic.DBClose()