Skip to content

Commit 26ae1b9

Browse files
committed
Move sigterm channel to internal/util
1 parent 9eb8782 commit 26ae1b9

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

cmd/micro/micro.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@ var (
4040
flagClean = flag.Bool("clean", false, "Clean configuration directory")
4141
optionFlags map[string]*string
4242

43-
sigterm chan os.Signal
44-
sighup chan os.Signal
43+
sighup chan os.Signal
4544

4645
timerChan chan func()
4746
)
@@ -360,9 +359,9 @@ func main() {
360359

361360
screen.Events = make(chan tcell.Event)
362361

363-
sigterm = make(chan os.Signal, 1)
362+
util.Sigterm = make(chan os.Signal, 1)
364363
sighup = make(chan os.Signal, 1)
365-
signal.Notify(sigterm, syscall.SIGTERM, syscall.SIGINT, syscall.SIGQUIT, syscall.SIGABRT)
364+
signal.Notify(util.Sigterm, syscall.SIGTERM, syscall.SIGINT, syscall.SIGQUIT, syscall.SIGABRT)
366365
signal.Notify(sighup, syscall.SIGHUP)
367366

368367
timerChan = make(chan func())
@@ -437,7 +436,7 @@ func DoEvent() {
437436
}
438437
}
439438
os.Exit(0)
440-
case <-sigterm:
439+
case <-util.Sigterm:
441440
for _, b := range buffer.OpenBuffers {
442441
if !b.Modified() {
443442
b.Fini()

internal/util/util.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ var (
4141

4242
// Stdout is a buffer that is written to stdout when micro closes
4343
Stdout *bytes.Buffer
44+
// Sigterm is a channel where micro exits when written
45+
Sigterm chan os.Signal
4446
)
4547

4648
func init() {

0 commit comments

Comments
 (0)