|
|
@@ -5,6 +5,7 @@ import (
|
|
|
"errors"
|
|
|
"flag"
|
|
|
"fmt"
|
|
|
+ "net"
|
|
|
"net/http"
|
|
|
"os"
|
|
|
"time"
|
|
|
@@ -16,6 +17,7 @@ import (
|
|
|
"hnyfkj.com.cn/rtu/linux/utils/jsonrpc2"
|
|
|
|
|
|
"hnyfkj.com.cn/rtu/linux/rtu/cbd/mcu_ctrl_board"
|
|
|
+ "hnyfkj.com.cn/rtu/linux/rtu/cbd/utils"
|
|
|
)
|
|
|
|
|
|
var (
|
|
|
@@ -97,12 +99,20 @@ func (p *program) run() {
|
|
|
p.http_server.Addr,
|
|
|
)
|
|
|
|
|
|
- err := p.http_server.ListenAndServe() // 同步阻塞
|
|
|
-
|
|
|
- if err != nil && !errors.Is(err, http.ErrServerClosed) {
|
|
|
- baseapp.Logger.Errorf("[%s] Start http server error: %v!!", p.name, err)
|
|
|
+ ln, err := net.Listen(network, listenAddr)
|
|
|
+ if err != nil {
|
|
|
+ baseapp.Logger.Errorf("[%s] Http listen failed: %v", p.name, err)
|
|
|
return
|
|
|
}
|
|
|
+
|
|
|
+ baseapp.Logger.Infof("[%s] Http server started", p.name)
|
|
|
+
|
|
|
+ utils.PlayAudioAsync("voices/welcome.wav") //播放开机语音
|
|
|
+
|
|
|
+ if err := p.http_server.Serve(ln); err != nil &&
|
|
|
+ !errors.Is(err, http.ErrServerClosed) {
|
|
|
+ baseapp.Logger.Errorf("[%s] Http server error: %v", p.name, err)
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
// Stop should not block. Return with a few seconds.
|