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
+4 -4
View File
@@ -17,12 +17,13 @@ package cmd
import ( import (
"fmt" "fmt"
"it2000.com.cn/tele-recv/utils"
"log" "log"
"os" "os"
"os/signal" "os/signal"
"syscall" "syscall"
"it2000.com.cn/tele-recv/utils"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
@@ -41,8 +42,6 @@ to quickly create a Cobra application.`,
}, },
} }
var run bool
func init() { func init() {
rootCmd.AddCommand(startCmd) rootCmd.AddCommand(startCmd)
@@ -77,7 +76,8 @@ func start() {
sig := <-sigs sig := <-sigs
fmt.Println() fmt.Println()
fmt.Println(sig) fmt.Println(sig)
run = false utils.ServerRunning = false
utils.StopSocketServer()
done <- true done <- true
}() }()
+39 -2
View File
@@ -1,17 +1,21 @@
package utils package utils
import ( import (
"io"
"log" "log"
"net" "net"
"time"
) )
const ServerType = "tcp" const ServerType = "tcp"
var ServerRunning = false var ServerRunning = false
var client net.Conn var client net.Conn
var server net.Listener
func Listen(address string) { func Listen(address string) {
server, err := net.Listen(ServerType, address) var err error
server, err = net.Listen(ServerType, address)
if err != nil { if err != nil {
log.Fatal("error in create server ", err) log.Fatal("error in create server ", err)
} }
@@ -25,14 +29,22 @@ func Listen(address string) {
} }
if client == nil { if client == nil {
client = conn client = conn
log.Println("client connected ", client.RemoteAddr())
} else { } else {
log.Println("client already connected, close") log.Println("client already connected, close")
client.Close()
client = nil
conn.Close() conn.Close()
} }
if IsClientConnected() {
connCheck()
}
time.Sleep(2 * time.Second)
} }
} }
func Write(data string) { func WriteToClient(data string) error {
defer func() { defer func() {
client.Close() client.Close()
client = nil client = nil
@@ -43,4 +55,29 @@ func Write(data string) {
client.Close() client.Close()
client = nil 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 ( import (
"database/sql" "database/sql"
_ "github.com/mattn/go-sqlite3"
"log" "log"
"os" "os"
"time" "time"
_ "github.com/mattn/go-sqlite3"
) )
const ( const (
@@ -18,7 +19,8 @@ const (
[tele_text] TEXT NOT NULL [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 ( var (
@@ -69,7 +71,13 @@ func InsertTelegram(teleString string) {
isWriting = true isWriting = true
db := getDb() db := getDb()
defer db.Close() 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 { if err != nil {
log.Fatal(err) log.Fatal(err)
} }