Merge pull request #262 from haiwen/add-ctime

add ctime
haiwen · Sep 9, 2019 · d4d026d · d4d026d
2 parents 9a1b17f + f01753c
commit d4d026d
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 8 deletions.
diff --git a/common/mq-mgr.c b/common/mq-mgr.c
@@ -24,7 +24,7 @@ static GAsyncQueue *
 seaf_mq_manager_channel_new (SeafMqManager *mgr, const char *channel)
 {
     GAsyncQueue *async_queue = NULL;
-    async_queue = g_async_queue_new_full ((GDestroyNotify)g_free);
+    async_queue = g_async_queue_new_full ((GDestroyNotify)json_decref);
 
     g_hash_table_replace (mgr->priv->chans, g_strdup (channel), async_queue);
 
@@ -51,12 +51,15 @@ seaf_mq_manager_publish_event (SeafMqManager *mgr, const char *channel, const ch
         return -1;
     }
 
-    g_async_queue_push (async_queue, g_strdup (content));
+    json_t *msg = json_object();
+    json_object_set_new (msg, "content", json_string(content));
+    json_object_set_new (msg, "ctime", json_integer(time(NULL)));
+    g_async_queue_push (async_queue, msg);
 
     return ret;
 }
 
-char *
+json_t *
 seaf_mq_manager_pop_event (SeafMqManager *mgr, const char *channel)
 {
     GAsyncQueue *async_queue = g_hash_table_lookup (mgr->priv->chans, channel);

diff --git a/common/mq-mgr.h b/common/mq-mgr.h
@@ -16,7 +16,7 @@ seaf_mq_manager_new ();
 int
 seaf_mq_manager_publish_event (SeafMqManager *mgr, const char *channel, const char *content);
 
-char *
+json_t *
 seaf_mq_manager_pop_event (SeafMqManager *mgr, const char *channel);
 
 #endif
diff --git a/common/rpc-service.c b/common/rpc-service.c
@@ -250,7 +250,7 @@ seafile_publish_event(const char *channel, const char *content, GError **error)
     return ret;
 }
 
-char*
+json_t *
 seafile_pop_event(const char *channel, GError **error)
 {
     if (!channel) {

diff --git a/include/seafile-rpc.h b/include/seafile-rpc.h
@@ -1125,6 +1125,6 @@ seafile_get_repo_status(const char *repo_id, GError **error);
 int
 seafile_publish_event(const char *channel, const char *content, GError **error);
 
-char*
+json_t *
 seafile_pop_event(const char *channel, GError **error);
 #endif
diff --git a/lib/rpc_table.py b/lib/rpc_table.py
@@ -102,4 +102,5 @@
     [ "object", ["string", "string", "string", "int"] ],
     [ "object", ["string", "string", "string", "string", "string", "string", "string", "int", "int"] ],
     [ "object", ["string", "string", "string", "string", "string", "string", "int", "string", "int", "int"] ],
+    ["json", ["string"]],
 ]
diff --git a/python/seafile/rpcclient.py b/python/seafile/rpcclient.py
@@ -795,7 +795,7 @@ def cancel_copy_task(task_id):
     def publish_event(channel, content):
         pass
 
-    @searpc_func("string", ["string"])
+    @searpc_func("json", ["string"])
     def pop_event(channel):
         pass
 
diff --git a/server/seaf-server.c b/server/seaf-server.c
@@ -640,7 +640,7 @@ static void start_rpc_service (const char *seafile_dir)
     searpc_server_register_function ("seafserv-threaded-rpcserver",
                                      seafile_pop_event,
                                      "pop_event",
-                                     searpc_signature_string__string());
+                                     searpc_signature_json__string());
 
 
     searpc_server_register_function ("seafserv-threaded-rpcserver",