Skip to content

Commit eac750f

Browse files
committed
error handling added
1 parent 3fcd6f3 commit eac750f

File tree

6 files changed

+36
-21
lines changed

6 files changed

+36
-21
lines changed

controllers/executables.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,22 @@ func killProcess() {
99
cmd := exec.Command("killall", "-9", "app-godemon-app-godemon-tmp-generated")
1010
cmd.Stdout = os.Stdout
1111
cmd.Stderr = os.Stderr
12-
cmd.Run()
12+
err := cmd.Run()
13+
ErrorHandle(err)
1314
}
1415

1516
func execMOD() {
1617
cmd := exec.Command("./app-godemon-app-godemon-tmp-generated")
1718
cmd.Stdout = os.Stdout
1819
cmd.Stderr = os.Stderr
19-
cmd.Run()
20+
err := cmd.Run()
21+
ErrorHandle(err)
2022
}
2123

2224
func execFile(filepath string) {
2325
cmd := exec.Command("go", "run", filepath)
2426
cmd.Stdout = os.Stdout
2527
cmd.Stderr = os.Stderr
26-
cmd.Run()
28+
err := cmd.Run()
29+
ErrorHandle(err)
2730
}

controllers/functions.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,11 @@ func ExecMOD() {
1616
byteValue, err := ioutil.ReadAll(jsonFile)
1717
ErrorHandle(err)
1818
var pr models.Project
19-
json.Unmarshal(byteValue, &pr)
19+
err = json.Unmarshal(byteValue, &pr)
20+
ErrorHandle(err)
2021
for i := 0; i < len(pr.Vars); i++ {
21-
os.Setenv(pr.Vars[i].Key, pr.Vars[i].Value)
22+
err = os.Setenv(pr.Vars[i].Key, pr.Vars[i].Value)
23+
ErrorHandle(err)
2224
}
2325
execMOD()
2426
}
@@ -37,7 +39,7 @@ func ProgramStarting(cnf *string, filepath string, modOrFile string, command str
3739
} else if *cnf == "cnf" {
3840
filepath, modOrFile = cnfFunc(command, "", "")
3941
} else if *cnf == "deploy" {
40-
deploy()
42+
deploy(oso, arch)
4143
} else if init == true {
4244
if arch == "" && oso == "" {
4345
fmt.Println("\nPlease specify OS architecture and OS platform")

controllers/jsonLoading.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ func loadProjectInfo() models.Project {
1616
byteValue, err := ioutil.ReadAll(jsonFile)
1717
ErrorHandle(err)
1818
var project models.Project
19-
json.Unmarshal(byteValue, &project)
19+
err = json.Unmarshal(byteValue, &project)
20+
ErrorHandle(err)
2021
if project.Name == "" || project.Path == "" {
2122
fmt.Println("Project name or path is empty")
2223
os.Exit(1)

controllers/logsToCli.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,6 @@ func timeLog() {
1212
cmd := exec.Command("printf", "\\e[1;34m%-6s\\e[m\n", log)
1313
cmd.Stdout = os.Stdout
1414
cmd.Stderr = os.Stderr
15-
cmd.Run()
15+
err := cmd.Run()
16+
ErrorHandle(err)
1617
}

controllers/pv.go

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ func deploy(oso string, archL string) {
1414
var arch string
1515
pr := loadProjectInfo()
1616
name := pr.Name
17-
os.Chdir(pr.Path)
17+
err := os.Chdir(pr.Path)
18+
ErrorHandle(err)
1819
if oso != "" && archL == "" {
1920
goos = "GOOS=" + oso
2021
arch = "GOARCH=" + archL
@@ -25,13 +26,16 @@ func deploy(oso string, archL string) {
2526
cmd := exec.Command("env", goos, arch, "go", "build", "-o", name)
2627
cmd.Stdout = os.Stdout
2728
cmd.Stderr = os.Stderr
28-
cmd.Run()
29+
err = cmd.Run()
30+
ErrorHandle(err)
2931
os.Exit(1)
3032
}
3133

3234
func initialize(name string, arch string, oso string) {
33-
os.Mkdir(name, 0777)
34-
os.Chdir(name)
35+
err := os.Mkdir(name, 0777)
36+
ErrorHandle(err)
37+
err = os.Chdir(name)
38+
ErrorHandle(err)
3539
var project models.Project
3640
path, _ := os.Getwd()
3741
project.Path = path
@@ -44,12 +48,15 @@ func initialize(name string, arch string, oso string) {
4448
command.Path = path
4549
command.Option = "mod"
4650
project.Commands = append(project.Commands, command)
47-
file, _ := json.MarshalIndent(project, "", " ")
48-
_ = ioutil.WriteFile("project.json", file, 0644)
51+
file, err := json.MarshalIndent(project, "", " ")
52+
ErrorHandle(err)
53+
err = ioutil.WriteFile("project.json", file, 0644)
54+
ErrorHandle(err)
4955
cmd := exec.Command("go", "mod", "init", name)
5056
cmd.Stdout = os.Stdout
5157
cmd.Stderr = os.Stderr
52-
cmd.Run()
58+
err = cmd.Run()
59+
ErrorHandle(err)
5360
os.Exit(1)
5461
}
5562

main.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ func main() {
1111
cmd := exec.Command("printf", "\\e[1;34m%-6s\\e[m\n", "Starting godemon... \n")
1212
cmd.Stdout = os.Stdout
1313
cmd.Stderr = os.Stderr
14-
cmd.Run()
14+
err := cmd.Run()
15+
controllers.ErrorHandle(err)
1516
version := "2.2.2"
1617
doneChan := make(chan bool)
1718
filepath, modOrFile, cnf, command, help, init, name, oso, arch := controllers.LoadCMD("", "")
@@ -22,17 +23,17 @@ func main() {
2223
doneChan <- true
2324
}()
2425
err := controllers.WatchFiles(filepath)
25-
if err != nil {
26-
fmt.Println(err)
27-
}
26+
controllers.ErrorHandle(err)
2827
fmt.Println("File has been changed")
2928
if modOrFile == "mod" {
30-
os.Chdir(filepath)
29+
err = os.Chdir(filepath)
30+
controllers.ErrorHandle(err)
3131
controllers.TimeLog()
3232
cmd := exec.Command("go", "build", "-o", "app-godemon-app-godemon-tmp-generated")
3333
cmd.Stdout = os.Stdout
3434
cmd.Stderr = os.Stderr
35-
cmd.Run()
35+
err = cmd.Run()
36+
controllers.ErrorHandle(err)
3637
go controllers.ExecMOD()
3738
} else if modOrFile == "file" {
3839
controllers.TimeLog()

0 commit comments

Comments
 (0)