|
@@ -1,7 +1,6 @@
|
|
|
package conf
|
|
package conf
|
|
|
|
|
|
|
|
import (
|
|
import (
|
|
|
- "github.com/v2fly/v2ray-core/v4/app/observatory"
|
|
|
|
|
"strings"
|
|
"strings"
|
|
|
|
|
|
|
|
"github.com/jhump/protoreflect/desc"
|
|
"github.com/jhump/protoreflect/desc"
|
|
@@ -9,6 +8,7 @@ import (
|
|
|
|
|
|
|
|
"github.com/v2fly/v2ray-core/v4/app/commander"
|
|
"github.com/v2fly/v2ray-core/v4/app/commander"
|
|
|
loggerservice "github.com/v2fly/v2ray-core/v4/app/log/command"
|
|
loggerservice "github.com/v2fly/v2ray-core/v4/app/log/command"
|
|
|
|
|
+ observatoryservice "github.com/v2fly/v2ray-core/v4/app/observatory/command"
|
|
|
handlerservice "github.com/v2fly/v2ray-core/v4/app/proxyman/command"
|
|
handlerservice "github.com/v2fly/v2ray-core/v4/app/proxyman/command"
|
|
|
statsservice "github.com/v2fly/v2ray-core/v4/app/stats/command"
|
|
statsservice "github.com/v2fly/v2ray-core/v4/app/stats/command"
|
|
|
"github.com/v2fly/v2ray-core/v4/common/serial"
|
|
"github.com/v2fly/v2ray-core/v4/common/serial"
|
|
@@ -36,7 +36,7 @@ func (c *APIConfig) Build() (*commander.Config, error) {
|
|
|
case "statsservice":
|
|
case "statsservice":
|
|
|
services = append(services, serial.ToTypedMessage(&statsservice.Config{}))
|
|
services = append(services, serial.ToTypedMessage(&statsservice.Config{}))
|
|
|
case "observatoryservice":
|
|
case "observatoryservice":
|
|
|
- services = append(services, serial.ToTypedMessage(&observatory.Config{}))
|
|
|
|
|
|
|
+ services = append(services, serial.ToTypedMessage(&observatoryservice.Config{}))
|
|
|
default:
|
|
default:
|
|
|
if !strings.HasPrefix(s, "#") {
|
|
if !strings.HasPrefix(s, "#") {
|
|
|
continue
|
|
continue
|
Shelikhoo