From 821bf6b1d67402fd290d5063fdfa3de33c6e0a38 Mon Sep 17 00:00:00 2001
From: "insanity@loafle.com" <insanity@loafle.com>
Date: Sat, 20 May 2017 15:05:19 +0900
Subject: [PATCH] .

---
 grpc/grpc.proto | 69 ++++++++++++++++++++++++-------------------------
 1 file changed, 34 insertions(+), 35 deletions(-)

diff --git a/grpc/grpc.proto b/grpc/grpc.proto
index e35b89d..ed32d8c 100644
--- a/grpc/grpc.proto
+++ b/grpc/grpc.proto
@@ -4,23 +4,23 @@ syntax = "proto3";
 message Empty {}
 
 //Event-relative area
-enum DiscoveryEventType {
-    DISCOVERY_START = 0;
-    DISCOVERY_HOST_START = 1;
-    DISCOVERY_HOST_FOUND = 2;
-    DISCOVERY_HOST_DONE = 3;
-    DISCOVERY_PORT_START = 4;
-    DISCOVERY_PORT_FOUND = 5;
-    DISCOVERY_PORT_DONE = 6;
-    DISCOVERY_SERVICE_START = 7;
-    DISCOVERY_SERVICE_FOUND = 8;
-    DISCOVERY_SERVICE_DONE = 9;
-    DISCOVERY_DONE = 10;
-}
 
 message DiscoveryEvent {
     string agentId = 1;
     string taskId = 2;
+    enum DiscoveryEventType {
+        DISCOVERY_START = 0;
+        DISCOVERY_HOST_START = 1;
+        DISCOVERY_HOST_FOUND = 2;
+        DISCOVERY_HOST_DONE = 3;
+        DISCOVERY_PORT_START = 4;
+        DISCOVERY_PORT_FOUND = 5;
+        DISCOVERY_PORT_DONE = 6;
+        DISCOVERY_SERVICE_START = 7;
+        DISCOVERY_SERVICE_FOUND = 8;
+        DISCOVERY_SERVICE_DONE = 9;
+        DISCOVERY_DONE = 10;
+    }
     DiscoveryEventType evtType = 3;
     int64 occurredDate = 4;
     map<string, string> data = 5;
@@ -30,17 +30,6 @@ service Discovery {
     rpc event(DiscoveryEvent) returns (Empty){}
 }
 
-enum TaskResultEventType {
-    TASK_POL_INTERVAL_UPDATE = 0;
-    TASK_SENSOR_START = 1;
-    TASK_SENSOR_STOP = 2;
-    TASK_SENSOR_ADD = 3;
-    TASK_SENSOR_REMOVE = 4;
-    TASK_SENSOR_UPDATE = 5;
-    TASK_CRAWLER_UPDATE = 6;
-    TASK_AGENT_UPDATE = 7;
-    TASK_LOG_SEND = 8;
-}
 
 enum TaskResultState {
     FAILED = 0;
@@ -51,6 +40,17 @@ enum TaskResultState {
 message TaskResultEvent {
     string agentId = 1;
     string taskId = 2;
+    enum TaskResultEventType {
+        TASK_POL_INTERVAL_UPDATE = 0;
+        TASK_SENSOR_START = 1;
+        TASK_SENSOR_STOP = 2;
+        TASK_SENSOR_ADD = 3;
+        TASK_SENSOR_REMOVE = 4;
+        TASK_SENSOR_UPDATE = 5;
+        TASK_CRAWLER_UPDATE = 6;
+        TASK_AGENT_UPDATE = 7;
+        TASK_LOG_SEND = 8;
+    }
     TaskResultEventType evtType = 3;
     int64 occurredDate = 4;
     TaskResultState result = 5;
@@ -61,23 +61,22 @@ service TaskResult {
     rpc event(TaskResultEvent) returns (Empty){}
 }
 
-enum AgentEventType {
-    AGENT_STARTED = 0;
-    AGENT_ERROR = 1;
-    AGENT_STOP = 2;
-}
-
-message ErrorInfo {
-    int32 errorNum = 1;
-    string from = 2;
-    string errorMessage = 3;
-}
 
 message AgentEvent {
     string agentId = 1;
+    enum AgentEventType {
+        AGENT_STARTED = 0;
+        AGENT_ERROR = 1;
+        AGENT_STOP = 2;
+    }
     AgentEventType evtType = 2;
     int64 occurredDate = 3;
     string description = 4;
+    message ErrorInfo {
+        int32 errorNum = 1;
+        string from = 2;
+        string errorMessage = 3;
+    }
     ErrorInfo errInfo = 5;
 }