provide squeezelite error log in UI

components/platform_console/app_squeezelite/cmd_squeezelite.c

@@ -40,7 +40,8 @@ const __attribute__((section(".rodata_desc"))) esp_app_desc_t esp_app_desc = {
 #endif
 };
 
-extern int main(int argc, char **argv);
+extern int squeezelite_main(int argc, char **argv);
+
 static int launchsqueezelite(int argc, char **argv);
 
 /** Arguments used by 'squeezelite' function */
@@ -54,39 +55,33 @@ static struct {
 } thread_parms ;
 
 #define ADDITIONAL_SQUEEZELITE_ARGS 5
-static void squeezelite_thread(void *arg){
+static void squeezelite_thread(void *arg){  
 	ESP_LOGV(TAG ,"Number of args received: %u",thread_parms.argc );
 	ESP_LOGV(TAG ,"Values:");
     for(int i = 0;i<thread_parms.argc; i++){
     	ESP_LOGV(TAG ,"     %s",thread_parms.argv[i]);
     }
-
-	ESP_LOGI(TAG ,"Calling squeezelite");
-	int ret = main(thread_parms.argc,thread_parms.argv);
-	ESP_LOGV(TAG ,"Exited from squeezelite's main(). Freeing argv structure.");
-
-	for(int i=0;i<thread_parms.argc;i++){
-		ESP_LOGV(TAG ,"Freeing char buffer for parameter %u", i+1);
-		free(thread_parms.argv[i]);
-	}
-	ESP_LOGV(TAG ,"Freeing argv pointer");
-	free(thread_parms.argv);
-	
-	if(!wait_for_commit()){
-		ESP_LOGW(TAG,"Unable to commit configuration. ");
-	}
     
-    messaging_post_message(MESSAGING_ERROR, MESSAGING_CLASS_SYSTEM, "squeezelite exited with error code %d", ret);   
+    ESP_LOGI(TAG ,"Calling squeezelite");
+    int ret = squeezelite_main(thread_parms.argc, thread_parms.argv);
+        
+    messaging_post_message(MESSAGING_WARNING, MESSAGING_CLASS_SYSTEM, "squeezelite exited with error code %d", ret);   
 
     if (ret == 1) {
-        int wait = 60;
-        messaging_post_message(MESSAGING_ERROR, MESSAGING_CLASS_SYSTEM, "Rebooting in %d sec", wait); 
+        int wait = 60;      
+        wait_for_commit();
+        messaging_post_message(MESSAGING_WARNING, MESSAGING_CLASS_SYSTEM, "Rebooting in %d sec", wait); 
         vTaskDelay( pdMS_TO_TICKS(wait * 1000));
         esp_restart();
     } else {
         messaging_post_message(MESSAGING_ERROR, MESSAGING_CLASS_SYSTEM, "Correct command line and reboot"); 
         vTaskSuspend(NULL);
     }
+
+	ESP_LOGV(TAG, "Exited from squeezelite's main(). Freeing argv structure.");
+
+	for(int i=0;i<thread_parms.argc;i++) free(thread_parms.argv[i]);
+	free(thread_parms.argv);
 }
 
 static int launchsqueezelite(int argc, char **argv) {

components/services/messaging.c

@@ -219,18 +219,23 @@ esp_err_t messaging_post_to_queue(messaging_handle_t subscriber_handle, single_m
 		}
 		return ESP_LOG_DEBUG;
 	}
+    
 void messaging_post_message(messaging_types type,messaging_classes msg_class, const char *fmt, ...){
+    va_list va;
+	va_start(va, fmt);
+    vmessaging_post_message(type, msg_class, fmt, va);
+    va_end(va);
+}
+    
+void vmessaging_post_message(messaging_types type,messaging_classes msg_class, const char *fmt, va_list va){    
 	single_message_t * message=NULL;
 	size_t msg_size=0;
 	size_t ln =0;
 	messaging_list_t * cur=⊤
-	va_list va;
-	va_start(va, fmt);
 	ln = vsnprintf(NULL, 0, fmt, va)+1;
 	msg_size = sizeof(single_message_t)+ln;
 	message = (single_message_t *)malloc_init_external(msg_size);
 	vsprintf(message->message, fmt, va);
-	va_end(va);
 	message->msg_size = msg_size;
 	message->type = type;
 	message->msg_class = msg_class;

components/services/messaging.h

@@ -34,6 +34,7 @@ cJSON *  messaging_retrieve_messages(RingbufHandle_t buf_handle);
 messaging_handle_t messaging_register_subscriber(uint8_t max_count, char * name);
 esp_err_t messaging_post_to_queue(messaging_handle_t subscriber_handle, single_message_t * message, size_t message_size);
 void messaging_post_message(messaging_types type,messaging_classes msg_class, const char * fmt, ...);
+void vmessaging_post_message(messaging_types type,messaging_classes msg_class, const char *fmt, va_list va);
 cJSON *  messaging_retrieve_messages(RingbufHandle_t buf_handle);
 single_message_t *  messaging_retrieve_message(RingbufHandle_t buf_handle);
 void log_send_messaging(messaging_types msgtype,const char *fmt, ...);

components/squeezelite/CMakeLists.txt

@@ -13,6 +13,7 @@ idf_component_register( SRC_DIRS . external ac101 tas57xx wm8978
 						 			display
 						 			tools
 						 			audio
+									_override
 						EMBED_FILES vu_s.data arrow.data
 )
 

components/squeezelite/embedded.c

@@ -17,6 +17,7 @@
 #include "esp_wifi.h"
 #include "monitor.h"
 #include "platform_config.h"
+#include "messaging.h"
 
 mutex_type slimp_mutex;
 static jmp_buf jumpbuf;
@@ -29,6 +30,15 @@ _sig_func_ptr signal(int sig, _sig_func_ptr func) {
 	return NULL;
 }
 
+void em_logprint(const char *fmt, ...) {
+    va_list args;
+	va_start(args, fmt);
+	vfprintf(stderr, fmt, args);    
+    vmessaging_post_message(MESSAGING_ERROR, MESSAGING_CLASS_SYSTEM, fmt, args); 
+	va_end(args);
+	fflush(stderr);
+}
+
 void *audio_calloc(size_t nmemb, size_t size) {
 	return calloc(nmemb, size);
 }
@@ -55,6 +65,7 @@ int embedded_init(void) {
 	mutex_create(slimp_mutex);
 	sb_controls_init();
 	custom_player_id = sb_displayer_init() ? 100 : 101;
+    
     return setjmp(jumpbuf);
 }
 

components/squeezelite/embedded.h

@@ -51,6 +51,10 @@ extern u8_t custom_player_id;
 // to force some special buffer attribute
 #define EXT_BSS __attribute__((section(".ext_ram.bss"))) 
 
+// otherwise just leave it empty
+void em_logprint(const char *fmt, ...);
+#define LOG_ERROR(fmt, ...) em_logprint("%s %s:%d " fmt "\n", logtime(), __FUNCTION__, __LINE__, ##__VA_ARGS__); 
+
 // all exit() calls are made from main thread (or a function called in main thread)
 void embedded_exit(int code);
 #define exit(code) do { embedded_exit(code); } while (0)

components/squeezelite/main.c

@@ -275,7 +275,11 @@ static void sighandler(int signum) {
 	signal(signum, SIG_DFL);
 }
 
+#ifndef EMBEDDED
 int main(int argc, char **argv) {
+#else
+int squeezelite_main(int argc, char **argv) {
+#endif
 	char *server = NULL;
 	char *output_device = "default";
 	char *include_codecs = NULL;
@@ -845,5 +849,5 @@ int main(int argc, char **argv) {
 	free_ssl_symbols();
 #endif	
 
-	exit(0);
+	return(0);
 }

components/squeezelite/squeezelite.h

@@ -393,7 +393,6 @@ typedef enum { lERROR = 0, lWARN, lINFO, lDEBUG, lSDEBUG } log_level;
 const char *logtime(void);
 void logprint(const char *fmt, ...);
 
-#define LOG_ERROR(fmt, ...) logprint("%s %s:%d " fmt "\n", logtime(), __FUNCTION__, __LINE__, ##__VA_ARGS__)
 #define LOG_WARN(fmt, ...)  if (loglevel >= lWARN)  logprint("%s %s:%d " fmt "\n", logtime(), __FUNCTION__, __LINE__, ##__VA_ARGS__)
 #define LOG_INFO(fmt, ...)  if (loglevel >= lINFO)  logprint("%s %s:%d " fmt "\n", logtime(), __FUNCTION__, __LINE__, ##__VA_ARGS__)
 #define LOG_DEBUG(fmt, ...) if (loglevel >= lDEBUG) logprint("%s %s:%d " fmt "\n", logtime(), __FUNCTION__, __LINE__, ##__VA_ARGS__)
@@ -406,6 +405,10 @@ typedef int sockfd;
 #include "embedded.h"
 #endif
 
+#ifndef LOG_ERROR
+#define LOG_ERROR(fmt, ...) logprint("%s %s:%d " fmt "\n", logtime(), __FUNCTION__, __LINE__, ##__VA_ARGS__)
+#endif
+
 #if !defined(MSG_NOSIGNAL)
 #define MSG_NOSIGNAL 0
 #endif

components/squeezelite/stream.c

@@ -390,7 +390,7 @@ void stream_init(log_level level, unsigned stream_buf_size) {
 	buf_init(streambuf, stream_buf_size);
 	if (streambuf->buf == NULL) {
 		LOG_ERROR("unable to malloc buffer");
-		exit(0);
+		exit(2);
 	}
 	
 #if USE_SSL
@@ -401,7 +401,7 @@ void stream_init(log_level level, unsigned stream_buf_size) {
 	SSLctx = SSL_CTX_new(SSLv23_client_method());
 	if (SSLctx == NULL) {
 		LOG_ERROR("unable to allocate SSL context");
-		exit(0);
+		exit(3);
 	}	
 	SSL_CTX_set_options(SSLctx, SSL_OP_NO_SSLv2);
 #if !LINKALL && !NO_SSLSYM

components/telnet/telnet.c

@@ -128,8 +128,8 @@ void init_telnet(){
 	if (bMirrorToUART) uart_fd = open("/dev/uart/0", O_RDWR);
 
 	ESP_ERROR_CHECK(esp_vfs_register("/dev/pkspstdout", &vfs, NULL));
-	freopen("/dev/pkspstdout", "wb", stdout);
-	freopen("/dev/pkspstdout", "wb", stderr);
+	freopen("/dev/pkspstdout", "w", stdout);
+	freopen("/dev/pkspstdout", "w", stderr);
 
 	bIsEnabled=true;
 }

main/CMakeLists.txt

@@ -1,6 +1,5 @@
 idf_component_register(SRC_DIRS . 
 					PRIV_REQUIRES _override esp_common wifi-manager pthread squeezelite-ota platform_console telnet display targets
-                    	EMBED_FILES ../server_certs/github.pem
 					LDFRAGMENTS "linker.lf"
                     	)
 #get_target_property(ill ${COMPONENT_LIB} INTERFACE_LINK_LIBRARIES)

main/esp_app_main.c

@@ -381,13 +381,6 @@ void app_main()
 		GDS_TextPos(display, GDS_FONT_DEFAULT, GDS_TEXT_CENTERED, GDS_TEXT_CLEAR | GDS_TEXT_UPDATE, "RECOVERY");
 	}
 
-
-/*
-	ESP_LOGI(TAG,"Checking if certificates need to be updated");
-	update_certificates(false);
-	MEMTRACE_PRINT_DELTA();
-*/    
-
 	ESP_LOGD(TAG,"Getting firmware OTA URL (if any)");
 	fwurl = process_ota_url();