From 6b8857328e3d3611e251faacb6e857b9b2e5458d Mon Sep 17 00:00:00 2001
From: bharnden <bharnden@users.noreply.github.com>
Date: Tue, 19 Mar 2019 21:26:06 -0700
Subject: [PATCH] grpc updated and dixed exception events to working order

---
 daemon/core/grpc/client.py |  1 +
 daemon/core/grpc/server.py |  9 +++------
 daemon/proto/core.proto    | 12 ++++++++++--
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/daemon/core/grpc/client.py b/daemon/core/grpc/client.py
index 6d1720e3..e935ba44 100644
--- a/daemon/core/grpc/client.py
+++ b/daemon/core/grpc/client.py
@@ -492,6 +492,7 @@ def main():
 
         # create session
         session_data = client.create_session()
+        client.exception_events(session_data.id, lambda x: print(x))
         print("created session: {}".format(session_data))
         print("default services: {}".format(client.get_service_defaults(session_data.id)))
         print("emane models: {}".format(client.get_emane_models(session_data.id)))
diff --git a/daemon/core/grpc/server.py b/daemon/core/grpc/server.py
index 0bb51704..2d910cfa 100644
--- a/daemon/core/grpc/server.py
+++ b/daemon/core/grpc/server.py
@@ -522,16 +522,13 @@ class CoreApiServer(core_pb2_grpc.CoreApiServicer):
             try:
                 event = queue.get(timeout=1)
                 exception_event = core_pb2.ExceptionEvent()
-                event_time = event.date
-                if event_time is not None:
-                    event_time = float(event_time)
                 update_proto(
                     exception_event,
                     node=event.node,
-                    session=event.session,
-                    level=event.level,
+                    session=int(event.session),
+                    level=event.level.value,
                     source=event.source,
-                    date=event_time,
+                    date=event.date,
                     text=event.text,
                     opaque=event.opaque
                 )
diff --git a/daemon/proto/core.proto b/daemon/proto/core.proto
index de4d18be..7b06ce84 100644
--- a/daemon/proto/core.proto
+++ b/daemon/proto/core.proto
@@ -257,9 +257,9 @@ message ExceptionEventsRequest {
 message ExceptionEvent {
     int32 node = 1;
     int32 session = 2;
-    string level = 3;
+    ExceptionLevel level = 3;
     string source = 4;
-    float date = 5;
+    string date = 5;
     string text = 6;
     string opaque = 7;
 }
@@ -661,6 +661,14 @@ enum MobilityAction {
     MOBILITY_STOP = 2;
 }
 
+enum ExceptionLevel {
+    EXCEPTION_DEFAULT = 0;
+    FATAL = 1;
+    ERROR = 2;
+    WARNING = 3;
+    NOTICE = 4;
+}
+
 message Hook {
     SessionState state = 1;
     string file = 2;