From 1b9b5ec0bb4bcf0b96667424d6ce04d8b629d017 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Michal=20Voc=C5=AF?= <michal@ruk.cuni.cz>
Date: Fri, 25 Jun 2010 09:08:51 +0000
Subject: [PATCH] plugin framework fixes

---
 org.glite.lb.logger/Makefile          | 4 ++--
 org.glite.lb.logger/src/event_queue.c | 4 ++--
 org.glite.lb.logger/src/interlogd.c   | 2 +-
 org.glite.lb.logger/src/plugin_mgr.c  | 1 +
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/org.glite.lb.logger/Makefile b/org.glite.lb.logger/Makefile
index 765cd76..b6f57a9 100644
--- a/org.glite.lb.logger/Makefile
+++ b/org.glite.lb.logger/Makefile
@@ -51,7 +51,7 @@ CFLAGS:=${DEBUG} \
 LDFLAGS:=-L${stagedir}/${libdir} \
 	${COVERAGE_FLAGS} 
 
-COMPILE:=libtool --mode=compile ${CC} -rpath ${stagedir}/${libdir}
+COMPILE:=libtool --mode=compile ${CC} 
 LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/${libdir} ${LDFLAGS}
 LINKXX:=libtool --mode=link ${CXX} -rpath ${stagedir}/${libdir} ${LDFLAGS} 
 INSTALL:=libtool --mode=install install
@@ -228,5 +228,5 @@ il_test.o IlTestBase.o server_msgTest.o event_queueTest.o input_queue_socketTest
 	${CXX} ${CFLAGS} ${TEST_INC} -c $< -o $@
 
 clean:
-	rm -rvf .libs/ *.o *.no ${LOGD} ${INTERLOGD} ${NOTIF_INTERLOGD} ${MAN_GZ}
+	rm -rvf .libs/ *.o *.lo ${LOGD} ${INTERLOGD} ${NOTIF_INTERLOGD} ${MAN_GZ}
 	rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/
diff --git a/org.glite.lb.logger/src/event_queue.c b/org.glite.lb.logger/src/event_queue.c
index 84e32df..726666c 100644
--- a/org.glite.lb.logger/src/event_queue.c
+++ b/org.glite.lb.logger/src/event_queue.c
@@ -70,7 +70,7 @@ event_queue_create(char *server_name, struct il_output_plugin *output)
 		  c = '/';
 	  }
   }
-  eq->dest_name = strdup(server_name);
+  eq->dest_name = strdup(s);
   if(p)
     *(p-1) = c;
 
@@ -81,7 +81,7 @@ event_queue_create(char *server_name, struct il_output_plugin *output)
 	  eq->dest_port = 0; // use whatever default there is for given url scheme
   }
 #else
-	  eq->dest_port = p && c == ':' ? atoi(p)+1 : GLITE_JOBID_DEFAULT_PORT+1;
+          eq->dest_port = (p && c == ':') ? atoi(p)+1 : GLITE_JOBID_DEFAULT_PORT+1;
 #endif
 
   /* setup output functions */
diff --git a/org.glite.lb.logger/src/interlogd.c b/org.glite.lb.logger/src/interlogd.c
index f1afa5a..f8002ec 100644
--- a/org.glite.lb.logger/src/interlogd.c
+++ b/org.glite.lb.logger/src/interlogd.c
@@ -567,7 +567,7 @@ main (int argc, char **argv)
 				  glite_common_log(LOG_CATEGORY_CONTROL, LOG_PRIORITY_ERROR, "Failed to load plugin %s: %s\n", name, error_get_msg());
 			  }
 		  }
-		  s = p;
+		  s = p + 1;
 	  }
   }
 
diff --git a/org.glite.lb.logger/src/plugin_mgr.c b/org.glite.lb.logger/src/plugin_mgr.c
index 03f01fc..0611ba8 100644
--- a/org.glite.lb.logger/src/plugin_mgr.c
+++ b/org.glite.lb.logger/src/plugin_mgr.c
@@ -62,6 +62,7 @@ int plugin_mgr_init(const char *plugin_name, char *cfg)
 	}
 
 	plugin->next = plugins;
+	plugins = plugin;
 	DL_RESOLVESYM(plugin->plugin_def.plugin_init, dl_handle, "plugin_init", int(*)(char *));
 	DL_RESOLVESYM(plugin->plugin_def.plugin_supports_scheme, dl_handle,  "plugin_supports_scheme", int(*)(const char *));
 	DL_RESOLVESYM(plugin->plugin_def.event_queue_connect, dl_handle, "event_queue_connect", int (*)(struct event_queue*));
-- 
1.8.2.3