Commit1599702

authored

Merge pull request#334 from nxtrace/main

SYNC: v1.5.0-beta.1

2 parentsacc1905 +2240f79 commit1599702Copy full SHA for 1599702

File tree

+22

-17

lines changed

+22

-17

lines changed

Lines changed: 18 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -394,22 +394,30 @@ func Execute() {`
`394`	`394`	`//go func() {`
`395`	`395`	`//defer wg.Done()`
`396`	`396`	`//}()`
`397`		`-if strings.EqualFold(*dataOrigin, "LEOMOEAPI") {`
	`397`	`+var leoWs *wshandle.WsConn`
	`398`	`+needsLeoWS := strings.EqualFold(*dataOrigin, "LEOMOEAPI")`
	`399`	`+if needsLeoWS {`
`398`	`400`	`if !strings.EqualFold(*powProvider, "api.nxtrace.org") {`
`399`	`401`	`util.PowProviderParam = *powProvider`
`400`	`402`	`}`
`401`	`403`	`if util.EnvDataProvider != "" {`
`402`	`404`	`*dataOrigin = util.EnvDataProvider`
`403`		`-} else {`
`404`		`-w := wshandle.New()`
`405`		`-w.Interrupt = make(chan os.Signal, 1)`
`406`		`-signal.Notify(w.Interrupt, os.Interrupt)`
`407`		`-defer func() {`
`408`		`-if w.Conn != nil {`
`409`		`-_ = w.Conn.Close()`
`410`		`-}`
`411`		`-}()`
`412`	`405`	`}`
	`406`	`+needsLeoWS = strings.EqualFold(*dataOrigin, "LEOMOEAPI")`
	`407`	`+if needsLeoWS {`
	`408`	`+leoWs = wshandle.New()`
	`409`	`+if leoWs != nil {`
	`410`	`+leoWs.Interrupt = make(chan os.Signal, 1)`
	`411`	`+signal.Notify(leoWs.Interrupt, os.Interrupt)`
	`412`	`+}`
	`413`	`+}`
	`414`	`+}`
	`415`	`+if leoWs != nil {`
	`416`	`+defer func() {`
	`417`	`+if leoWs.Conn != nil {`
	`418`	`+_ = leoWs.Conn.Close()`
	`419`	`+}`
	`420`	`+}()`
`413`	`421`	`}`
`414`	`422`
`415`	`423`	`if *from != "" {`

Lines changed: 4 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -146,13 +146,10 @@ func prepareTrace(req traceRequest) (*traceExecution, int, error) {`
`146`	`146`	`exec.Req.DN42 = true`
`147`	`147`	`}`
`148`	`148`
`149`		`-needsLeoWS := false`
`150`		`-if strings.EqualFold(dataProvider, "LEOMOEAPI") {`
`151`		`-if util.EnvDataProvider != "" {`
`152`		`-dataProvider = util.EnvDataProvider`
`153`		`-} else {`
`154`		`-needsLeoWS = true`
`155`		`-}`
	`149`	`+needsLeoWS := strings.EqualFold(dataProvider, "LEOMOEAPI")`
	`150`	`+if needsLeoWS && util.EnvDataProvider != "" {`
	`151`	`+dataProvider = util.EnvDataProvider`
	`152`	`+needsLeoWS = strings.EqualFold(dataProvider, "LEOMOEAPI")`
`156`	`153`	`}`
`157`	`154`
`158`	`155`	`if exec.Req.DN42 {`

Comments

(0)