Changeset 3543

Timestamp:

08/16/08 16:23:59 (4 months ago)

Author:

dgollub

Message:

Fallback to "data" ObjTypeSink? if present, to allow intermix of "data"
objtype sink with other objtype sinks.

Handle conncet event where less then 2 sink engines are present.
e.g.: file-sync (data) and random-pim-plugin (contact, event) - all
objtypes links would have less then two sink engines...

Location:

trunk/opensync

Files:

• client/opensync_client_proxy.c (modified) (1 diff)
• engine/opensync_obj_engine.c (modified) (4 diffs)

trunk/opensync/client/opensync_client_proxy.c

@@ -1028 +1028 @@
                 goto error;
 
+        if (haspluginconfig) {
+                OSyncList *r = osync_plugin_config_get_resources(config);
+                for (; r; r = r->next) {
+                        OSyncPluginResource *res = r->data;
+
+                        if (!osync_plugin_resource_is_enabled(res))
+                                continue;
+
+                        const char *objtype = osync_plugin_resource_get_objtype(res);
+                        OSyncObjTypeSink *sink = osync_client_proxy_find_objtype_sink(proxy, objtype);
+                         /* TODO: In discovery phase *sink COULD be NULL. Review if this is correct behavior. */
+                        if (sink) {
+                                osync_objtype_sink_ref(sink);
+                                proxy->objtypes = g_list_append(proxy->objtypes, sink);
+                        }
+                }
+        }
+
 #ifdef OPENSYNC_UNITTESTS
         // Introduced (only) for testing/debugging purpose (mock-sync)

trunk/opensync/engine/opensync_obj_engine.c

@@ -101 +101 @@
                         
         if (osync_bitcount(engine->sink_errors | engine->sink_connects) == g_list_length(engine->sink_engines)) {
-                if (osync_bitcount(engine->sink_connects) < 2) {
-                        osync_error_set(&locerror, OSYNC_ERROR_GENERIC, "Less than 2 sink_engines are connected");
-                        osync_obj_engine_set_error(engine, locerror);
-                } else if (osync_bitcount(engine->sink_errors)) {
+                if (osync_bitcount(engine->sink_errors)) {
                         osync_error_set(&locerror, OSYNC_ERROR_GENERIC, "At least one sink_engine failed while connecting");
                         osync_obj_engine_set_error(engine, locerror);
@@ -721 +718 @@
 
         osync_trace(TRACE_INTERNAL, "Loaded %i mappings", osync_mapping_table_num_mappings(engine->mapping_table));
+
+        const char *objtype = osync_obj_engine_get_objtype(engine);
         
         int num = osync_engine_num_proxies(engine->parent);
@@ -726 +725 @@
         for (i = 0; i < num; i++) {
                 OSyncClientProxy *proxy = osync_engine_nth_proxy(engine->parent, i);
+                OSyncObjTypeSink *sink = osync_client_proxy_find_objtype_sink(proxy, objtype); 
+                if (!sink) {
+                        /* "data" sink engine counts also as valid. */
+                        sink = osync_client_proxy_find_objtype_sink(proxy, "data"); 
+                        if (!sink)
+                                continue;
+                }
                 
                 OSyncSinkEngine *sinkengine = osync_sink_engine_new(i, proxy, engine, error);
@@ -916 +922 @@
 
                                 OSyncObjTypeSink *objtype_sink = osync_member_find_objtype_sink(member, engine->objtype);
+                                /* If sink could not be found use "data" sink if available */
+                                if (!objtype_sink)
+                                        objtype_sink = osync_member_find_objtype_sink(member, "data");
+                                /* TODO: Review if objtype_sink = NULL is valid at all. */
 
                                 for (e = sinkengine->entries; e; e = e->next) {