Skip to content

Commit 8f6fe6b

Browse files
committed
fix darwin release builds
1 parent 3561a39 commit 8f6fe6b

File tree

3 files changed

+38
-13
lines changed

3 files changed

+38
-13
lines changed

pkg/config/config.go

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package config
33
import (
44
"crypto/tls"
55
"fmt"
6-
"github.com/xyproto/gionice"
76
"math"
87
"os"
98
"runtime"
@@ -325,19 +324,9 @@ func LoadConfig(configLocation string) (*Config, error) {
325324
if err = ValidateConfig(cfg); err != nil {
326325
return cfg, err
327326
}
328-
if cfg.General.IONicePriority != "" {
329-
var nicePriority gionice.PriClass
330-
if nicePriority, err = gionice.Parse(cfg.General.IONicePriority); err != nil {
331-
return cfg, err
332-
}
333-
if err = gionice.SetIDPri(0, nicePriority, 7, gionice.IOPRIO_WHO_PGRP); err != nil {
334-
log.Warnf("can't set i/o priority %s, error: %v", cfg.General.IONicePriority, err)
335-
}
336-
}
337-
if err = gionice.SetNicePri(0, gionice.PRIO_PROCESS, cfg.General.CPUNicePriority); err != nil {
338-
log.Warnf("can't set CPU priority %s, error: %v", cfg.General.CPUNicePriority, err)
327+
if err = cfg.SetPriority(); err != nil {
328+
return cfg, err
339329
}
340-
341330
return cfg, nil
342331
}
343332

pkg/config/config_darwin.go

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package config
2+
3+
import (
4+
"github.com/apex/log"
5+
"syscall"
6+
)
7+
8+
func (cfg *Config) SetPriority() error {
9+
if err := syscall.Setpriority(0, 0, cfg.General.CPUNicePriority); err != nil {
10+
log.Warnf("can't set CPU priority %s, error: %v", cfg.General.CPUNicePriority, err)
11+
}
12+
return nil
13+
}

pkg/config/config_linux.go

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package config
2+
3+
import (
4+
"github.com/apex/log"
5+
"github.com/xyproto/gionice"
6+
)
7+
8+
func (cfg *Config) SetPriority() error {
9+
var err error
10+
if cfg.General.IONicePriority != "" {
11+
var nicePriority gionice.PriClass
12+
if nicePriority, err = gionice.Parse(cfg.General.IONicePriority); err != nil {
13+
return err
14+
}
15+
if err = gionice.SetIDPri(0, nicePriority, 7, gionice.IOPRIO_WHO_PGRP); err != nil {
16+
log.Warnf("can't set i/o priority %s, error: %v", cfg.General.IONicePriority, err)
17+
}
18+
}
19+
if err = gionice.SetNicePri(0, gionice.PRIO_PROCESS, cfg.General.CPUNicePriority); err != nil {
20+
log.Warnf("can't set CPU priority %s, error: %v", cfg.General.CPUNicePriority, err)
21+
}
22+
return nil
23+
}

0 commit comments

Comments
 (0)