fix run, add connection check

This commit is contained in:
zhiqiang feng
2020-12-22 11:45:25 +08:00
parent 6f00ed6029
commit 13ff3f09e8
3 changed files with 54 additions and 9 deletions
+39 -2
View File
@@ -1,17 +1,21 @@
package utils
import (
"io"
"log"
"net"
"time"
)
const ServerType = "tcp"
var ServerRunning = false
var client net.Conn
var server net.Listener
func Listen(address string) {
server, err := net.Listen(ServerType, address)
var err error
server, err = net.Listen(ServerType, address)
if err != nil {
log.Fatal("error in create server ", err)
}
@@ -25,14 +29,22 @@ func Listen(address string) {
}
if client == nil {
client = conn
log.Println("client connected ", client.RemoteAddr())
} else {
log.Println("client already connected, close")
client.Close()
client = nil
conn.Close()
}
if IsClientConnected() {
connCheck()
}
time.Sleep(2 * time.Second)
}
}
func Write(data string) {
func WriteToClient(data string) error {
defer func() {
client.Close()
client = nil
@@ -43,4 +55,29 @@ func Write(data string) {
client.Close()
client = nil
}
return err
}
func connCheck() bool {
_, err := client.Read(make([]byte, 0))
if err != nil && err != io.EOF {
// this connection is invalid
log.Println("conn closed....", err)
client = nil
return false
}
return true
}
func IsClientConnected() bool {
return client != nil
}
func StopSocketServer() {
if IsClientConnected() {
client.Close()
}
if server != nil {
server.Close()
}
}
+11 -3
View File
@@ -2,10 +2,11 @@ package utils
import (
"database/sql"
_ "github.com/mattn/go-sqlite3"
"log"
"os"
"time"
_ "github.com/mattn/go-sqlite3"
)
const (
@@ -18,7 +19,8 @@ const (
[tele_text] TEXT NOT NULL
)
`
TableInsert = "insert into telegram (tele_text) values (?)"
InsertNew = "insert into telegram (tele_text) values (?)"
InsertOld = "insert into telegram (tele_text, tele_processed) values (?, 1)"
)
var (
@@ -69,7 +71,13 @@ func InsertTelegram(teleString string) {
isWriting = true
db := getDb()
defer db.Close()
stmt, err := db.Prepare(TableInsert)
var insertSQL string
if IsClientConnected() && WriteToClient(teleString) == nil {
insertSQL = InsertOld
} else {
insertSQL = InsertNew
}
stmt, err := db.Prepare(insertSQL)
if err != nil {
log.Fatal(err)
}