fix play ip bug

Modules/play_ip/main.c

@@ -149,23 +149,23 @@ Boolean get_ip(char * pv)
         return TRUE;
 }
 
-void writeLog(char *type,char *action, char *remark)
-{
-	char logstr[256];
-    redisContext *pContext = redisConnect("127.0.0.1", 6379);
+// void writeLog(char *type,char *action, char *remark)
+// {
+// 	char logstr[256];
+//     redisContext *pContext = redisConnect("127.0.0.1", 6379);
 
-    if (NULL == pContext || pContext->err == 1)
-    {
-        printf("%s\n", pContext->errstr);
-        return;
-    }
-	sprintf(logstr, "%s,%s,%s", type, action, remark);
-    redisReply *pReply;
-    pReply = redisCommand(pContext, "LPUSH writelog-channel %s", logstr);
+//     if (NULL == pContext || pContext->err == 1)
+//     {
+//         printf("%s\n", pContext->errstr);
+//         return;
+//     }
+// 	sprintf(logstr, "%s,%s,%s", type, action, remark);
+//     redisReply *pReply;
+//     pReply = redisCommand(pContext, "LPUSH writelog-channel %s", logstr);
 
-    freeReplyObject(pReply);
-	redisFree(pContext);
-}
+//     freeReplyObject(pReply);
+// 	redisFree(pContext);
+// }
 
 int PlayIP()
 {
@@ -232,8 +232,8 @@ int PlayIP()
     system(cmd_line);
 
     // amplifier_switch(FALSE); //关闭功放
-    // system("/etc/scripts/set_volume.sh resume");
-    writeLog( FUN, "Play IP Address", ipaddr );
+    system("/etc/scripts/set_volume.sh resume");
+    // writeLog( FUN, "Play IP Address", ipaddr );
     return 0;
 }
 
@@ -246,7 +246,7 @@ int main(int argc, char *argv[]){
     GetCmdValue(VOL_CONF, "volume:always_play_ip", alwaysPlayIP, sizeof(alwaysPlayIP));
     if (strcmp(alwaysPlayIP, "yes") == 0)
     {
-        system("/usr/bin/amixer -q sset 'DAC',0 160");
+        system("/etc/scripts/set_volume.sh 7 7");
         PlayIP();
         return TRUE;
     }
@@ -282,7 +282,7 @@ int main(int argc, char *argv[]){
     {
         goto end;
     }
-    system("/usr/bin/amixer -q sset 'DAC',0 160");
+    system("/etc/scripts/set_volume.sh 7 7");
     PlayIP();
 
 end:

etc/rc.local

@@ -44,4 +44,7 @@ bash /usr/bin/init.sh
 # udhcpc -i usb0 -n
 /etc/scripts/system_led.sh &
 
+# write start log
+redis-cli LPUSH writelog-channel "INIT,System Started,"
+
 exit 0

etc/scripts/watch_process.sh

@@ -4,6 +4,12 @@ start()
 {
         while [ 1 ]
         do
+                REDIS_STAT="`ps -e|grep 'redis-server'|grep -v grep`"
+                if [ -z "${REDIS_STAT}" ];then
+                        /usr/sbin/redis-server /etc/redis.conf > /dev/null 2>&1 &
+                        wd_c=`expr $wd_c + 1`
+                fi
+
                 HTTPD_STAT="`ps -e|grep speaker-cgi|grep -v grep`"
                 if [ -z "${HTTPD_STAT}" ];then
                         killall speaker-cgi > /dev/null 2>&1
@@ -17,12 +23,6 @@ start()
                         /etc/scripts/api_agent &
                 fi
 
-                REDIS_STAT="`ps -e|grep 'redis-server'|grep -v grep`"
-                if [ -z "${REDIS_STAT}" ];then
-                        /usr/sbin/redis-server /etc/redis.conf > /dev/null 2>&1 &
-                        wd_c=`expr $wd_c + 1`
-                fi
-
                 OUTPUTCTRL_STAT="`ps|grep output_control|grep -v grep`"
                 if [ -z "${OUTPUTCTRL_STAT}" ];then
                         /etc/scripts/output_control &
@@ -83,7 +83,7 @@ start()
                         sync
                 fi
 
-                [ $wd_c -gt 10 ] && /sbin/reboot
+                [ $wd_c -gt 15 ] && /sbin/reboot
 
                 sleep 15
         done