black-internet-days-ahead/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2024-11-22 08:31:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow read config from stdin

Browse source
This commit is contained in:
世界 2022-08-19 15:42:29 +08:00
parent d1c3dd0ee1
commit 12d7e19f32
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
2 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
cmd/sing-box/cmd_check.go
View file

@ -2,13 +2,9 @@ package main
import ( import (
"context" "context"
"os"
"github.com/sagernet/sing-box" "github.com/sagernet/sing-box"
"github.com/sagernet/sing-box/common/json"
"github.com/sagernet/sing-box/log" "github.com/sagernet/sing-box/log"
"github.com/sagernet/sing-box/option"
E "github.com/sagernet/sing/common/exceptions"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
@ -30,14 +26,9 @@ func init() {
} }
func check() error { func check() error {
configContent, err := os.ReadFile(configPath) options, err := readConfig()
if err != nil { if err != nil {
return E.Cause(err, "read config") return err
}
var options option.Options
err = json.Unmarshal(configContent, &options)
if err != nil {
return E.Cause(err, "decode config")
} }
ctx, cancel := context.WithCancel(context.Background()) ctx, cancel := context.WithCancel(context.Background())
_, err = box.New(ctx, options) _, err = box.New(ctx, options)

25
cmd/sing-box/cmd_run.go
View file

@ -2,6 +2,7 @@ package main
import ( import (
"context" "context"
"io"
"net/http" "net/http"
"os" "os"
"os/signal" "os/signal"
@ -32,15 +33,31 @@ func init() {
mainCommand.AddCommand(commandRun) mainCommand.AddCommand(commandRun)
} }
func run() error { func readConfig() (option.Options, error) {
configContent, err := os.ReadFile(configPath) var (
configContent []byte
err error
)
if configPath == "stdin" {
configContent, err = io.ReadAll(os.Stdin)
} else {
configContent, err = os.ReadFile(configPath)
}
if err != nil { if err != nil {
return E.Cause(err, "read config") return option.Options{}, E.Cause(err, "read config")
} }
var options option.Options var options option.Options
err = json.Unmarshal(configContent, &options) err = json.Unmarshal(configContent, &options)
if err != nil { if err != nil {
return E.Cause(err, "decode config") return option.Options{}, E.Cause(err, "decode config")
}
return options, nil
}
func run() error {
options, err := readConfig()
if err != nil {
return err
} }
if disableColor { if disableColor {
if options.Log == nil { if options.Log == nil {