Identity on off cmdline #323
Conversation
| @@ -609,7 +613,7 @@ func toggleIdentity(out *json.Encoder, fingerprint string, onOff bool) { | |||
| msg := fmt.Sprintf("identity with fingerprint %s not found", fingerprint) | |||
| log.Warn(msg) | |||
| respond(out, dto.Response{ | |||
| Code: SUCCESS, | |||
| Code: IDENTITY_NOT_FOUND, | |||
There was a problem hiding this comment.
Clint, I modified this code. If the fingerprint value is not matching, the Identity not found code will be set rather than success. Not sure whether it will affect any other code
There was a problem hiding this comment.
this makes me think that there should be something in the UI that should be updated?
DesktopEdge/MainWindow.xaml.cs
Outdated
| @@ -25,630 +25,755 @@ | |||
|
|
|||
There was a problem hiding this comment.
can you revert this file pls? i don't expect you made any changes here?
There was a problem hiding this comment.
or maybe it just needs to be merged? i didn't expect to see any ".cs" changes on this pr?
| @@ -484,6 +484,7 @@ public partial class MainWindow : Window { | |||
| serviceClient.OnServiceEvent += ServiceClient_OnServiceEvent; | |||
| serviceClient.OnTunnelStatusEvent += ServiceClient_OnTunnelStatusEvent; | |||
| serviceClient.OnMfaEvent += ServiceClient_OnMfaEvent; | |||
| serviceClient.OnLogLevelEvent += ServiceClient_OnLogLevelEvent; | |||
There was a problem hiding this comment.
looks like you need to use tabs in .cs files to be consistent
service/ziti-tunnel/cli/ipcClient.go
Outdated
| return | ||
| } else { | ||
| if responseMsg.Error != "" { | ||
| log.Info(responseMsg.Error) |
service/ziti-tunnel/cli/ipcClient.go
Outdated
| if tunnelStatus.Status != nil { | ||
| responseMsg := fn(args, tunnelStatus.Status, flags) | ||
| if responseMsg.Code == service.SUCCESS { | ||
| log.Info("\n" + responseMsg.Payload.(string) + "\n" + responseMsg.Message) |
There was a problem hiding this comment.
i probably would have used to statements here. also starting the log statement off with a new line was probably done on purpose but it just seems strange?
There was a problem hiding this comment.
I added the new line because I want the result in new line. Otherwise, it will get appended to the date time stamp of the log. could not remove the date time stamp from the log statements yet
There was a problem hiding this comment.
i'd say update the formatter then or don't use log.Info and just use fmt.Println for output like this...
service/ziti-tunnel/cli/ipcClient.go
Outdated
| } | ||
| } | ||
| } else { | ||
| log.Errorf("Ziti tunnel retuned nil status") |
There was a problem hiding this comment.
is it helpful to log the status too?
There was a problem hiding this comment.
status is nil. This happens when the pipe is not connected or the ziti-tunnel instance is not running
service/ziti-tunnel/cli/ipcClient.go
Outdated
| return | ||
| } else { | ||
| if responseMsg.Error != "" { | ||
| log.Info(responseMsg.Error) |
service/ziti-tunnel/cli/ipcClient.go
Outdated
| } | ||
| } | ||
| } else { | ||
| log.Errorf("Ziti tunnel retuned nil response") |
There was a problem hiding this comment.
log the response? is it helpful to see?
service/ziti-tunnel/cli/ipcClient.go
Outdated
| if err != nil { | ||
| log.Errorf("Connection to ipc pipe is not established, %v", err) | ||
| log.Errorf("Ziti Desktop Edge app may not be running") | ||
| return false |
| @@ -500,6 +500,10 @@ func serveIpc(conn net.Conn) { | |||
|
|
|||
| //save the state | |||
| rts.SaveState() | |||
| case "NotifyLogLevelUIAndUpdateService": | |||
| sendLogLevelAndNotify(enc, cmd.Payload["Level"].(string)) | |||
There was a problem hiding this comment.
you don't need NotifyLogLevelUIAndUpdateService nor NotifyIdentityUI. Both of those should happen already. setLogLevel should broadcast the log level event change and NotifyIdentityUI should be changed to send an identity event from toggleIdentity. let's discuss if that's not clear
Identity on off cmdline fmt
…e .gitignore with logs
…in a go routine just in case something ends up blocking the dispatch channel
initial stab at chunking nrpt rules
This PR also contains loglevel and feedback commands in the cmdline option