Skip to content

Commit c66b0c2

Browse files
committed
refactor: adjust code layout
- adjust setting field order - split `app` into smaller files
1 parent 036f31c commit c66b0c2

File tree

3 files changed

+26
-21
lines changed

3 files changed

+26
-21
lines changed

src/app/main.go

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ import (
1010
"mjpclab.dev/ghfs/src/setting"
1111
"mjpclab.dev/ghfs/src/tpl/defaultTheme"
1212
"mjpclab.dev/ghfs/src/tpl/theme"
13-
"os"
1413
"path/filepath"
15-
"strconv"
1614
"time"
1715
)
1816

@@ -130,19 +128,3 @@ func NewApp(params param.Params, setting *setting.Setting) (*App, []error) {
130128
logFileMan: logFileMan,
131129
}, nil
132130
}
133-
134-
func writePidFile(pidFilename string) (errs []error) {
135-
pidContent := strconv.Itoa(os.Getpid())
136-
pidFile, err := os.OpenFile(pidFilename, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0644)
137-
if err != nil {
138-
return []error{err}
139-
}
140-
141-
_, err = pidFile.WriteString(pidContent)
142-
errs = serverError.AppendError(errs, err)
143-
144-
err = pidFile.Close()
145-
errs = serverError.AppendError(errs, err)
146-
147-
return
148-
}

src/app/pidFile.go

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package app
2+
3+
import (
4+
"mjpclab.dev/ghfs/src/serverError"
5+
"os"
6+
"strconv"
7+
)
8+
9+
func writePidFile(pidFilePath string) (errs []error) {
10+
pidContent := strconv.Itoa(os.Getpid())
11+
pidFile, err := os.OpenFile(pidFilePath, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0644)
12+
if err != nil {
13+
return []error{err}
14+
}
15+
16+
_, err = pidFile.WriteString(pidContent)
17+
errs = serverError.AppendError(errs, err)
18+
19+
err = pidFile.Close()
20+
errs = serverError.AppendError(errs, err)
21+
22+
return
23+
}

src/setting/main.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ import (
66
)
77

88
type Setting struct {
9-
Quiet bool
109
PidFile string
10+
Quiet bool
1111
}
1212

1313
func ParseFromEnv() *Setting {
14-
quiet := util.GetBoolEnv("GHFS_QUIET")
1514
pidFile := os.Getenv("GHFS_PID_FILE")
15+
quiet := util.GetBoolEnv("GHFS_QUIET")
1616

1717
return &Setting{
18-
Quiet: quiet,
1918
PidFile: pidFile,
19+
Quiet: quiet,
2020
}
2121
}

0 commit comments

Comments
 (0)