Hardware-Hacking/p4wnp1_aloa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor fix, server build with latest grpcweb

Browse Source
This commit is contained in:
MaMe82
2018-10-11 21:32:06 +02:00
parent 636982ead9
commit 0b32635a5e
6 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web_client/jsDataHandling.go
+7 -1
View File
@@ -881,6 +881,8 @@ func (data *jsEventReceiver) handleHidEvent(hEv *jsHidEvent) {
case common_web.HidEventType_JOB_FAILED:
data.JobList.UpdateEntry(hEv.JobId, hEv.VMId, hEv.HasError, false, hEv.Message, hEv.Error, hEv.EvLogTime, "")
QuasarNotifyError("HIDScript job " + strconv.Itoa(int(hEv.JobId)) + " failed", hEv.Error, QUASAR_NOTIFICATION_POSITION_TOP)
/*
notification := &QuasarNotification{Object: O()}
notification.Message = "HIDScript job " + strconv.Itoa(int(hEv.JobId)) + " failed"
notification.Detail = hEv.Error
@@ -888,9 +890,13 @@ func (data *jsEventReceiver) handleHidEvent(hEv *jsHidEvent) {
notification.Type = QUASAR_NOTIFICATION_TYPE_NEGATIVE
notification.Timeout = 5000
QuasarNotify(notification)
*/
case common_web.HidEventType_JOB_SUCCEEDED:
data.JobList.UpdateEntry(hEv.JobId, hEv.VMId, hEv.HasError, true, hEv.Message, hEv.Result, hEv.EvLogTime, "")
QuasarNotifySuccess("HIDScript job " + strconv.Itoa(int(hEv.JobId)) + " succeeded", hEv.Result, QUASAR_NOTIFICATION_POSITION_TOP)
/*
notification := &QuasarNotification{Object: O()}
notification.Message = "HIDScript job " + strconv.Itoa(int(hEv.JobId)) + " succeeded"
notification.Detail = hEv.Result
@@ -898,7 +904,7 @@ func (data *jsEventReceiver) handleHidEvent(hEv *jsHidEvent) {
notification.Type = QUASAR_NOTIFICATION_TYPE_POSITIVE
notification.Timeout = 5000
QuasarNotify(notification)
*/
case common_web.HidEventType_JOB_CANCELLED:
data.JobList.UpdateEntry(hEv.JobId, hEv.VMId, true, false, hEv.Message, hEv.Message, hEv.EvLogTime, "")
default:
web_client/rpcClient.go
+1 -1
View File
@@ -154,7 +154,7 @@ func (rpc *Rpc) StoreTriggerActionSet(timeout time.Duration, set *pb.TriggerActi
ctx, cancel := context.WithTimeout(context.Background(), timeout)
defer cancel()
_,err = rpc.Client.StoreTriggerActionSets(ctx, set)
_,err = rpc.Client.StoreTriggerActionSet(ctx, set)
return err
}