v0.0.33 - Use rtc::FileRotatingLogSink.

Author: oddengine

Diff for: api.c

@@ -20,14 +20,9 @@ typedef int (*__initialize_library_fptr__)(raw_rtc_constraints_t constraints);
 typedef void *(*__calloc_fptr__)(size_t size);
 typedef void (*__free_fptr__)(void *p);
 
-typedef void *(*__create_default_logger_factory_fptr__)(void *fd, void *out, int level);
-typedef void *(*__create_default_logger_fptr__)(void *fd, void *factory, const char *scope);
-typedef void *(*__create_default_writer_fptr__)(void *fd, raw_default_writer_constraints_t *constraints, raw_default_writer_observer_t *cb);
-
-typedef int (*__writer_open_fptr__)(void *writer, const char *path);
-typedef int (*__writer_write_fptr__)(void *writer, const char *message, size_t size);
-typedef size_t (*__writer_size_fptr__)(void *writer);
-typedef int (*__writer_close_fptr__)(void *writer);
+typedef void (*__log_info_fptr__)(const char *message);
+typedef void (*__log_warn_fptr__)(const char *message);
+typedef void (*__log_error_fptr__)(const char *message);
 
 typedef void *(*__create_peer_connection_factory_fptr__)(void *fd);
 typedef raw_rtp_capabilities_t (*__get_rtp_sender_capabilities_fptr__)(void *factory, const char *kind);
@@ -103,14 +98,9 @@ __initialize_library_fptr__ __initialize_library__;
 __calloc_fptr__ __calloc__;
 __free_fptr__ __free__;
 
-__create_default_logger_factory_fptr__ __create_default_logger_factory__;
-__create_default_logger_fptr__ __create_default_logger__;
-__create_default_writer_fptr__ __create_default_writer__;
-
-__writer_open_fptr__ __writer_open__;
-__writer_write_fptr__ __writer_write__;
-__writer_size_fptr__ __writer_size__;
-__writer_close_fptr__ __writer_close__;
+__log_info_fptr__ __log_info__;
+__log_warn_fptr__ __log_warn__;
+__log_error_fptr__ __log_error__;
 
 __create_peer_connection_factory_fptr__ __create_peer_connection_factory__;
 __get_rtp_sender_capabilities_fptr__ __get_rtp_sender_capabilities__;
@@ -182,9 +172,6 @@ __rtp_sender_get_parameters_fptr__ __rtp_sender_get_parameters__;
 __rtp_sender_get_stats_fptr__ __rtp_sender_get_stats__;
 __rtp_sender_release_fptr__ __rtp_sender_release__;
 
-raw_default_writer_observer_t *__logger_writer_observer__;
-extern void __onloggerwriterresize__(void *target);
-
 raw_peer_connection_observer_t *__peer_connection_observer__;
 extern void __onsignalingchange__(void *observer, const char *new_state);
 extern void __ondatachannel__(void *observer, void *data_channel);
@@ -224,14 +211,9 @@ int InitializeLibrary(const char *file, raw_rtc_constraints_t constraints)
     __calloc__ = (__calloc_fptr__)dlsym(handle, "Calloc");
     __free__ = (__free_fptr__)dlsym(handle, "Free");
 
-    __create_default_logger_factory__ = (__create_default_logger_factory_fptr__)dlsym(handle, "CreateDefaultLoggerFactory");
-    __create_default_logger__ = (__create_default_logger_fptr__)dlsym(handle, "CreateDefaultLogger");
-    __create_default_writer__ = (__create_default_writer_fptr__)dlsym(handle, "CreateDefaultWriter");
-
-    __writer_open__ = (__writer_open_fptr__)dlsym(handle, "WriterOpen");
-    __writer_write__ = (__writer_write_fptr__)dlsym(handle, "WriterWrite");
-    __writer_size__ = (__writer_size_fptr__)dlsym(handle, "WriterSize");
-    __writer_close__ = (__writer_close_fptr__)dlsym(handle, "WriterClose");
+    __log_info__ = (__log_info_fptr__)dlsym(handle, "LogInfo");
+    __log_warn__ = (__log_warn_fptr__)dlsym(handle, "LogWarn");
+    __log_error__ = (__log_error_fptr__)dlsym(handle, "LogError");
 
     __create_peer_connection_factory__ = (__create_peer_connection_factory_fptr__)dlsym(handle, "CreatePeerConnectionFactory");
     __get_rtp_sender_capabilities__ = (__get_rtp_sender_capabilities_fptr__)dlsym(handle, "GetRtpSenderCapabilities");
@@ -303,9 +285,6 @@ int InitializeLibrary(const char *file, raw_rtc_constraints_t constraints)
     __rtp_sender_get_stats__ = (__rtp_sender_get_stats_fptr__)dlsym(handle, "RtpSenderGetStats");
     __rtp_sender_release__ = (__rtp_sender_release_fptr__)dlsym(handle, "RtpSenderRelease");
 
-    __logger_writer_observer__ = malloc(sizeof(raw_default_writer_observer_t));
-    __logger_writer_observer__->onresize = __onloggerwriterresize__;
-
     __peer_connection_observer__ = malloc(sizeof(raw_peer_connection_observer_t));
     __peer_connection_observer__->onsignalingchange = __onsignalingchange__;
     __peer_connection_observer__->ondatachannel = __ondatachannel__;
@@ -340,46 +319,22 @@ void Free(void *p)
     return __free__(p);
 }
 
-void *CreateDefaultLoggerFactory(void *fd, void *out, int level)
-{
-    // __debugf__(6, "===> CreateDefaultLoggerFactory()");
-    return __create_default_logger_factory__(fd, out, level);
-}
-
-void *CreateDefaultLogger(void *fd, void *factory, const char *scope)
-{
-    // __debugf__(6, "===> CreateDefaultLogger()");
-    return __create_default_logger__(fd, factory, scope);
-}
-
-void *CreateDefaultWriter(void *fd, raw_default_writer_constraints_t *constraints)
-{
-    // __debugf__(6, "===> CreateDefaultWriter()");
-    return __create_default_writer__(fd, constraints, __logger_writer_observer__);
-}
-
-int WriterOpen(void *writer, const char *path)
-{
-    // __debugf__(6, "===> WriterOpen()");
-    return __writer_open__(writer, path);
-}
-
-int WriterWrite(void *writer, const char *message, size_t size)
+void LogInfo(const char *message)
 {
-    // __debugf__(6, "===> WriterWrite()");
-    return __writer_write__(writer, message, size);
+    // __debugf__(6, "===> LogInfo(%s)", message);
+    return __log_info__(message);
 }
 
-size_t WriterSize(void *writer)
+void LogWarn(const char *message)
 {
-    // __debugf__(6, "===> WriterSize()");
-    return __writer_size__(writer);
+    // __debugf__(6, "===> LogWarn(%s)", message);
+    return __log_warn__(message);
 }
 
-int WriterClose(void *writer)
+void LogError(const char *message)
 {
-    // __debugf__(6, "===> WriterClose()");
-    return __writer_close__(writer);
+    // __debugf__(6, "===> LogError(%s)", message);
+    return __log_error__(message);
 }
 
 void *CreatePeerConnectionFactory(void *fd)

Diff for: api.go

@@ -40,34 +40,39 @@ const (
 )
 
 var (
-	factory_   ILoggerFactory
-	logger_    ILogger
 	mtx_       sync.Mutex
 	observers_ = make(map[uintptr]interface{})
 )
 
 // RTCConstraints dictionary is used to describe a set of rtc library.
 type RTCConstraints struct {
 	KeyframeInterval int64 // ms. 0: auto.
+	Logger           struct {
+		Directory string
+		MaxSize   int64
+		History   int64
+	}
 }
 
-func InitializeLibrary(path string, constraints *RTCConstraints, writer *DefaultWriterConstraints) error {
+func InitializeLibrary(path string, constraints *RTCConstraints) error {
 	file := C.CString(path)
-	defer func() {
-		C.free(unsafe.Pointer(file))
-	}()
 
 	var config C.raw_rtc_constraints_t
 	config.keyframe_interval = C.int64_t(constraints.KeyframeInterval)
+	config.logger.directory = C.CString(constraints.Logger.Directory)
+	config.logger.max_size = C.size_t(constraints.Logger.MaxSize)
+	config.logger.history = C.size_t(constraints.Logger.History)
+
+	defer func() {
+		C.free(unsafe.Pointer(file))
+		C.free(unsafe.Pointer(config.logger.directory))
+	}()
 
 	eno := int(C.InitializeLibrary(file, config))
 	if eno != 0 {
-		Errorf("Failed to initialize library: %d", eno)
+		fmt.Printf("Failed to initialize library: %d\n", eno)
 		return fmt.Errorf("error %d", eno)
 	}
-
-	factory_ = NewDefaultLoggerFactory(writer)
-	logger_ = factory_.NewLogger("RTC")
 	return nil
 }
 
@@ -191,26 +196,50 @@ type PeerConnectionInterface interface {
 	// OnTrack               func(track MediaStreamTrackInterface, streams ...MediaStreamInterface)
 }
 
-//export __onloggerwriterresize__
-func __onloggerwriterresize__(target unsafe.Pointer) {
+func LogInfo(message string) {
+	msg := C.CString(message)
 	defer func() {
-		if err := recover(); err != nil {
-			logger_.Errorf("Unexpected error occurred: %v", err)
-			debug.PrintStack()
-		}
+		C.free(unsafe.Pointer(msg))
 	}()
 
-	dw := (*DefaultWriter)(target)
-	if dw != nil {
-		dw.OnResize()
-	}
+	C.LogInfo(msg)
+}
+
+func LogWarn(message string) {
+	msg := C.CString(message)
+	defer func() {
+		C.free(unsafe.Pointer(msg))
+	}()
+
+	C.LogWarn(msg)
+}
+
+func LogError(message string) {
+	msg := C.CString(message)
+	defer func() {
+		C.free(unsafe.Pointer(msg))
+	}()
+
+	C.LogError(msg)
+}
+
+func LogInfof(format string, args ...interface{}) {
+	LogInfo(fmt.Sprintf(format, args...))
+}
+
+func LogWarnf(format string, args ...interface{}) {
+	LogWarn(fmt.Sprintf(format, args...))
+}
+
+func LogErrorf(format string, args ...interface{}) {
+	LogError(fmt.Sprintf(format, args...))
 }
 
 //export __onsignalingchange__
 func __onsignalingchange__(target unsafe.Pointer, new_state *C.char) {
 	defer func() {
 		if err := recover(); err != nil {
-			logger_.Errorf("Unexpected error occurred: %v", err)
+			LogErrorf("Unexpected error occurred: %v", err)
 			debug.PrintStack()
 		}
 	}()
@@ -225,7 +254,7 @@ func __onsignalingchange__(target unsafe.Pointer, new_state *C.char) {
 func __ondatachannel__(target unsafe.Pointer, data_channel unsafe.Pointer) {
 	defer func() {
 		if err := recover(); err != nil {
-			logger_.Errorf("Unexpected error occurred: %v", err)
+			LogErrorf("Unexpected error occurred: %v", err)
 			debug.PrintStack()
 		}
 	}()
@@ -240,7 +269,7 @@ func __ondatachannel__(target unsafe.Pointer, data_channel unsafe.Pointer) {
 func __onrenegotiationneeded__(target unsafe.Pointer) {
 	defer func() {
 		if err := recover(); err != nil {
-			logger_.Errorf("Unexpected error occurred: %v", err)
+			LogErrorf("Unexpected error occurred: %v", err)
 			debug.PrintStack()
 		}
 	}()
@@ -255,7 +284,7 @@ func __onrenegotiationneeded__(target unsafe.Pointer) {
 func __onconnectionchange__(target unsafe.Pointer, new_state *C.char) {
 	defer func() {
 		if err := recover(); err != nil {
-			logger_.Errorf("Unexpected error occurred: %v", err)
+			LogErrorf("Unexpected error occurred: %v", err)
 			debug.PrintStack()
 		}
 	}()
@@ -270,7 +299,7 @@ func __onconnectionchange__(target unsafe.Pointer, new_state *C.char) {
 func __oniceconnectionchange__(target unsafe.Pointer, new_state *C.char) {
 	defer func() {
 		if err := recover(); err != nil {
-			logger_.Errorf("Unexpected error occurred: %v", err)
+			LogErrorf("Unexpected error occurred: %v", err)
 			debug.PrintStack()
 		}
 	}()
@@ -285,7 +314,7 @@ func __oniceconnectionchange__(target unsafe.Pointer, new_state *C.char) {
 func __onicegatheringchange__(target unsafe.Pointer, new_state *C.char) {
 	defer func() {
 		if err := recover(); err != nil {
-			logger_.Errorf("Unexpected error occurred: %v", err)
+			LogErrorf("Unexpected error occurred: %v", err)
 			debug.PrintStack()
 		}
 	}()
@@ -300,7 +329,7 @@ func __onicegatheringchange__(target unsafe.Pointer, new_state *C.char) {
 func __onicecandidate__(target unsafe.Pointer, candidate *C.char, sdp_mid *C.char, sdp_mline_index C.int) {
 	defer func() {
 		if err := recover(); err != nil {
-			logger_.Errorf("Unexpected error occurred: %v", err)
+			LogErrorf("Unexpected error occurred: %v", err)
 			debug.PrintStack()
 		}
 	}()
@@ -319,7 +348,7 @@ func __onicecandidate__(target unsafe.Pointer, candidate *C.char, sdp_mid *C.cha
 func __onicecandidateerror__(target unsafe.Pointer, address *C.char, port C.int, url *C.char, error_code C.int, error_text *C.char) {
 	defer func() {
 		if err := recover(); err != nil {
-			logger_.Errorf("Unexpected error occurred: %v", err)
+			LogErrorf("Unexpected error occurred: %v", err)
 			debug.PrintStack()
 		}
 	}()
@@ -334,7 +363,7 @@ func __onicecandidateerror__(target unsafe.Pointer, address *C.char, port C.int,
 func __ontrack__(target unsafe.Pointer, transceiver unsafe.Pointer) {
 	defer func() {
 		if err := recover(); err != nil {
-			logger_.Errorf("Unexpected error occurred: %v", err)
+			LogErrorf("Unexpected error occurred: %v", err)
 			debug.PrintStack()
 		}
 	}()
@@ -356,7 +385,7 @@ func __ontrack__(target unsafe.Pointer, transceiver unsafe.Pointer) {
 func __oncreatesessiondescriptionsuccess__(target unsafe.Pointer, typ *C.char, sdp *C.char) {
 	defer func() {
 		if err := recover(); err != nil {
-			logger_.Errorf("Unexpected error occurred: %v", err)
+			LogErrorf("Unexpected error occurred: %v", err)
 			debug.PrintStack()
 		}
 	}()
@@ -375,7 +404,7 @@ func __oncreatesessiondescriptionsuccess__(target unsafe.Pointer, typ *C.char, s
 func __oncreatesessiondescriptionfailure__(target unsafe.Pointer, name *C.char, message *C.char) {
 	defer func() {
 		if err := recover(); err != nil {
-			logger_.Errorf("Unexpected error occurred: %v", err)
+			LogErrorf("Unexpected error occurred: %v", err)
 			debug.PrintStack()
 		}
 	}()
@@ -391,7 +420,7 @@ func __oncreatesessiondescriptionfailure__(target unsafe.Pointer, name *C.char,
 func __onsetsessiondescriptionsuccess__(target unsafe.Pointer) {
 	defer func() {
 		if err := recover(); err != nil {
-			logger_.Errorf("Unexpected error occurred: %v", err)
+			LogErrorf("Unexpected error occurred: %v", err)
 			debug.PrintStack()
 		}
 	}()
@@ -407,7 +436,7 @@ func __onsetsessiondescriptionsuccess__(target unsafe.Pointer) {
 func __onsetsessiondescriptionfailure__(target unsafe.Pointer, name *C.char, message *C.char) {
 	defer func() {
 		if err := recover(); err != nil {
-			logger_.Errorf("Unexpected error occurred: %v", err)
+			LogErrorf("Unexpected error occurred: %v", err)
 			debug.PrintStack()
 		}
 	}()

Diff for: api.h

@@ -14,14 +14,9 @@ int InitializeLibrary(const char *file, raw_rtc_constraints_t constraints);
 void *Calloc(size_t size);
 void Free(void *p);
 
-void *CreateDefaultLoggerFactory(void *fd, void *out, int level);
-void *CreateDefaultLogger(void *fd, void *factory, const char *scope);
-void *CreateDefaultWriter(void *fd, raw_default_writer_constraints_t *constraints);
-
-int WriterOpen(void *writer, const char *path);
-int WriterWrite(void *writer, const char *message, size_t size);
-size_t WriterSize(void *writer);
-int WriterClose(void *writer);
+void LogInfo(const char *message);
+void LogWarn(const char *message);
+void LogError(const char *message);
 
 void *CreatePeerConnectionFactory(void *fd);
 raw_rtp_capabilities_t GetRtpSenderCapabilities(void *factory, const char *kind);