Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions conf/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,9 @@ func (n *NodeConfig) UnmarshalJSON(data []byte) (err error) {
return err
}
if len(rn.Include) != 0 {
file, _ := strings.CutPrefix(rn.Include, ":")
switch file {
case "http", "https":
rsp, err := http.Get(file)
switch {
case strings.HasPrefix(rn.Include, "http://"), strings.HasPrefix(rn.Include, "https://"):
rsp, err := http.Get(rn.Include)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion core/xray/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func (c *Xray) addOutbound(config *core.OutboundHandlerConfig) error {
}
handler, ok := rawHandler.(outbound.Handler)
if !ok {
return fmt.Errorf("not an InboundHandler: %s", err)
return fmt.Errorf("not an OutboundHandler: %s", err)
}
if err := c.ohm.AddHandler(context.Background(), handler); err != nil {
return err
Expand Down
3 changes: 2 additions & 1 deletion node/task.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,10 @@ func (c *Controller) nodeInfoMonitor() (err error) {

// Update limiter
if len(c.Options.Name) == 0 {
oldTag := c.tag
c.tag = c.buildNodeTag(newN)
// Remove Old limiter
limiter.DeleteLimiter(c.tag)
limiter.DeleteLimiter(oldTag)
// Add new Limiter
l := limiter.AddLimiter(c.tag, &c.LimitConfig, c.userList, newA)
c.limiter = l
Expand Down
Loading