From 71c57cb2a1e26bef6bacd8795f54658eea16851c Mon Sep 17 00:00:00 2001 From: Greg Date: Sat, 30 Nov 2024 21:49:00 +0700 Subject: [PATCH] up --- Dockerfile | 2 +- Makefile | 2 ++ TCPClient.go | 3 ++- config.yml | 4 ++-- main.go | 26 +------------------------- spot.go | 4 ++-- utils.go | 30 ++++++++++++++++++++++++++++++ 7 files changed, 40 insertions(+), 31 deletions(-) create mode 100644 Makefile diff --git a/Dockerfile b/Dockerfile index cabfde1..5da2162 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ WORKDIR /app COPY go.mod go.sum ./ -COPY clublog.go config.go config.yml database.go flexradio.go HTTPServer.go spot.go main.go TCPClient.go TCPServer.go utils.go log.go ./ +COPY config.go config.yml database.go flexradio.go spot.go main.go TCPClient.go TCPServer.go utils.go log.go xml.go ./ COPY templates/* . RUN go build -o bin main.go diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..1b9fa00 --- /dev/null +++ b/Makefile @@ -0,0 +1,2 @@ +build: + go build . \ No newline at end of file diff --git a/TCPClient.go b/TCPClient.go index d5391ee..5862794 100644 --- a/TCPClient.go +++ b/TCPClient.go @@ -135,7 +135,8 @@ func (c *TCPClient) ReadLine() { message, _ = strings.CutSuffix(message, "\r") if err != nil { Log.Errorf("Error reading message: %s", err) - continue + c.Conn.Close() + c.StartClient() } if strings.Contains(message, Cfg.Cluster.LoginPrompt) { diff --git a/config.yml b/config.yml index 245d728..62ae4b2 100644 --- a/config.yml +++ b/config.yml @@ -8,11 +8,11 @@ sqlite: sqlite_path: 'C:\Perso\Seafile\Radio\Logs\Log4OM\Vietnam.SQLite' # SQLite Db oath of Log4OM callsign: XV9Q # Log4OM Callsign used to check if you get spotted by someone cluster: - server: dxc.k0xm.net + server: cluster.f4bpo.com # dxc.k0xm.net port: 7300 login: xv9q skimmer: true - ft8: true + ft8: false ft4: false command: #SET/NOFILTER login_prompt: "Please enter your call:" diff --git a/main.go b/main.go index 2e5b5e4..fb3d05a 100644 --- a/main.go +++ b/main.go @@ -4,9 +4,7 @@ import ( "flag" "log" "os" - "os/signal" "path/filepath" - "syscall" ) func ParseFlags() (string, error) { @@ -65,32 +63,10 @@ func main() { FlexClient := NewFlexClient(*fRepo, TCPServer, TCPClient.SpotChanToFlex) // HTTPServer := NewHTTPServer(*cRepo, *fRepo, TCPServer, TCPClient.SpotChanToHTTPServer) - sigCh := make(chan os.Signal, 1) - signal.Notify(sigCh, syscall.SIGHUP, syscall.SIGINT, syscall.SIGQUIT, syscall.SIGTERM) - go FlexClient.StartFlexClient() go TCPClient.StartClient() go TCPServer.StartServer() - // Gracely closing all connextions if signal is received - for sig := range sigCh { - log.Infof("received signal: %v, shutting down all connections.", sig) - - TCPClient.Close() - TCPServer.Conn.Close() - FlexClient.Conn.Close() - - if err := fRepo.db.Close(); err != nil { - log.Error("failed to close the database connection properly") - os.Exit(1) - } - - if err := cRepo.db.Close(); err != nil { - log.Error("failed to close Log4OM database connection properly") - os.Exit(1) - } - - os.Exit(0) - } + CheckSignal(TCPClient, TCPServer, FlexClient, fRepo, cRepo) } diff --git a/spot.go b/spot.go index 59e7e16..79efa8f 100644 --- a/spot.go +++ b/spot.go @@ -96,8 +96,8 @@ func ProcessTelnetSpot(re *regexp.Regexp, spotRaw string, SpotChanToFlex chan Te SpotChanToFlex <- spot if spot.NewDXCC { - Log.Debugf("(** New DXCC **) DX: %s - Spotter: %s - Freq: %s - Band: %s - Mode: %s - Comment: %s - Time: %s - Command: %v, FlexSpot: %v", - spot.DX, spot.Spotter, spot.Frequency, spot.Band, spot.Mode, spot.Comment, spot.Time, spot.CommandNumber, spot.FlexSpotNumber) + Log.Debugf("(** New DXCC **) DX: %s - Spotter: %s - Freq: %s - Band: %s - Mode: %s - Comment: %s - Time: %s - DXCC: %s", + spot.DX, spot.Spotter, spot.Frequency, spot.Band, spot.Mode, spot.Comment, spot.Time, spot.DXCC) } if !spot.NewDXCC && spot.NewBand && spot.NewMode { diff --git a/utils.go b/utils.go index a81e375..d3a771f 100644 --- a/utils.go +++ b/utils.go @@ -2,7 +2,10 @@ package main import ( "log" + "os" + "os/signal" "strconv" + "syscall" ) func FreqMhztoHz(freq string) string { @@ -26,3 +29,30 @@ func FreqHztoMhz(freq string) string { return strconv.FormatFloat(frequency, 'f', 6, 64) } + +func CheckSignal(TCPClient *TCPClient, TCPServer *TCPServer, FlexClient *FlexClient, fRepo *FlexDXClusterRepository, cRepo *Log4OMContactsRepository) { + + sigCh := make(chan os.Signal, 1) + signal.Notify(sigCh, syscall.SIGHUP, syscall.SIGINT, syscall.SIGQUIT, syscall.SIGTERM) + + // Gracely closing all connextions if signal is received + for sig := range sigCh { + Log.Infof("received signal: %v, shutting down all connections.", sig) + + TCPClient.Close() + TCPServer.Conn.Close() + FlexClient.Conn.Close() + + if err := fRepo.db.Close(); err != nil { + Log.Error("failed to close the database connection properly") + os.Exit(1) + } + + if err := cRepo.db.Close(); err != nil { + Log.Error("failed to close Log4OM database connection properly") + os.Exit(1) + } + + os.Exit(0) + } +}