X-Git-Url: http://pilppa.org/gitweb/?p=libplpha.git;a=blobdiff_plain;f=src%2Fservicedir_listener.c;h=9b667da852d6dd8d709b81be7513d1fff3f1b1d9;hp=d3d42b236f769242ecdf6bcfae59c50a6272ccbe;hb=6d5562f5000da6d6c4cb9d7b32b29ad7dbbd6366;hpb=693290ca9caf63d5d5a52088e3f122fe2fee34e7

diff --git a/src/servicedir_listener.c b/src/servicedir_listener.c
index d3d42b2..9b667da 100644
--- a/src/servicedir_listener.c
+++ b/src/servicedir_listener.c
@@ -15,6 +15,8 @@
 #include <pthread.h>
 #include <fcntl.h>
 
+#include <plp/log.h>
+
 #include "common.h"
 #include "servicedir_listener.h"
 
@@ -55,49 +57,49 @@ static void *servicedir_listener_thread(void *thread_args_pointer)
 						CONST_SERVICE_DIRECTORY_LOCATION,
 						IN_CREATE | IN_ATTRIB | IN_MODIFY | IN_DELETE);
 			if (_dir_handle >= 0) {
-				printf("Waiting service directory file events\n");
+				log_info("Waiting service directory file events\n");
 				while (_listener_stop_requested == false) {
 					ii	= 0;
-					printf("Waiting service directory file event\n");
+					log_debug("Waiting service directory file event\n");
 					b_count	= read(_inotify_handle,
 							buffer,
 							buffer_max_size);
-					printf("Service directory file event received\n");
+					log_debug("Service directory file event received\n");
 					if (b_count >= 0) {
 						while (ii < b_count) {
 							event	= (struct inotify_event *)&buffer[ii];
-							printf("event length = %d\n", event->len);
+							log_debug("event length = %d\n", event->len);
 							if (event->len) {
 								if (event->mask & IN_CREATE) {
 									if ((event->mask & IN_ISDIR) == 0) {
-										printf("file create event: %s\n", event->name);
+										log_info("file create event: %s\n", event->name);
 									}
 									else {
-										printf("sub-directory create event: %s, no need to process\n", event->name);
+										log_debug("sub-directory create event: %s, no need to process\n", event->name);
 									}
 								}
 								else if (event->mask & IN_ATTRIB) {
 									if ((event->mask & IN_ISDIR) == 0) {
-										printf("file attribute change event: %s\n", event->name);
+										log_info("file attribute change event: %s\n", event->name);
 									}
 									else {
-										printf("sub-directory attribute change event: %s, no need to process\n", event->name);
+										log_debug("sub-directory attribute change event: %s, no need to process\n", event->name);
 									}
 								}
 								else if (event->mask & IN_MODIFY) {
 									if ((event->mask & IN_ISDIR) == 0) {
-										printf("file modify event: %s\n", event->name);
+										log_info("file modify event: %s\n", event->name);
 									}
 									else {
-										printf("sub-directory modify event: %s, no need to process\n", event->name);
+										log_debug("sub-directory modify event: %s, no need to process\n", event->name);
 									}
 								}
 								else if (event->mask & IN_DELETE) {
 									if ((event->mask & IN_ISDIR) == 0) {
-										printf("file delete event: %s\n", event->name);
+										log_info("file delete event: %s\n", event->name);
 									}
 									else {
-										printf("sub-directory delete event: %s, no need to process\n", event->name);
+										log_debug("sub-directory delete event: %s, no need to process\n", event->name);
 									}
 								}
 							}
@@ -105,10 +107,10 @@ static void *servicedir_listener_thread(void *thread_args_pointer)
 						}
 					}
 					else {
-						printf("Failed to initialize service directory listener: %s, event read failed.\n", CONST_SERVICE_DIRECTORY_LOCATION);
+						log_error("Failed to initialize service directory listener: %s, event read failed.\n", CONST_SERVICE_DIRECTORY_LOCATION);
 					}
 				}
-				printf("Closing service directory listener: %s, close request received.\n", CONST_SERVICE_DIRECTORY_LOCATION);
+				log_info("Closing service directory listener: %s, close request received.\n", CONST_SERVICE_DIRECTORY_LOCATION);
 				pthread_mutex_lock(&_listener_mutex);
 				if ((_inotify_handle > 0) && (_dir_handle)) {
 					inotify_rm_watch(_inotify_handle, _dir_handle);
@@ -117,7 +119,7 @@ static void *servicedir_listener_thread(void *thread_args_pointer)
 				pthread_mutex_unlock(&_listener_mutex);
 			}
 			else {
-				printf("Failed to initialize service directory listener: %s, event listener start-up error.\n", CONST_SERVICE_DIRECTORY_LOCATION);
+				log_error("Failed to initialize service directory listener: %s, event listener start-up error.\n", CONST_SERVICE_DIRECTORY_LOCATION);
 			}
 			pthread_mutex_lock(&_listener_mutex);
 			if (_inotify_handle > 0) {
@@ -127,7 +129,7 @@ static void *servicedir_listener_thread(void *thread_args_pointer)
 			pthread_mutex_unlock(&_listener_mutex);
 		}
 		else {
-			printf("Failed to initialize service directory listener: %s\n", CONST_SERVICE_DIRECTORY_LOCATION);
+			log_error("Failed to initialize service directory listener: %s\n", CONST_SERVICE_DIRECTORY_LOCATION);
 		}
 		if (buffer != NULL) {
 			free(buffer);
@@ -135,14 +137,14 @@ static void *servicedir_listener_thread(void *thread_args_pointer)
 		}
 	}
 	else {
-		printf("Failed to initialize service directory listener: %s, buffer allocation error.\n", CONST_SERVICE_DIRECTORY_LOCATION);
+		log_error("Failed to initialize service directory listener: %s, buffer allocation error.\n", CONST_SERVICE_DIRECTORY_LOCATION);
 	}
 	_listener_running	= false;
 	pthread_exit(NULL);
 }
 
 void start_servicedir_listener() {
-	printf("listen_closed_processes()\n");
+	log_debug("listen_closed_processes()\n");
 	init_servicedir_listener();
 	if (_listener_running == false) {
 		_listener_thread		= 0;