From 05747a0428b62e294f42b8821972c501f4648aa9 Mon Sep 17 00:00:00 2001 From: Chrystian Huot Date: Tue, 14 Jun 2022 14:35:06 -0400 Subject: [PATCH] Version 6.4.5 --- CHANGELOG.md | 5 +++++ COMPILING.md | 16 ++++++++-------- Makefile | 2 +- client/package-lock.json | 4 ++-- client/package.json | 2 +- docs/platforms/darwin.md | 12 ++++++------ docs/platforms/freebsd.md | 12 ++++++------ docs/platforms/linux.md | 12 ++++++------ docs/platforms/windows.md | 10 +++++----- server/call.go | 4 ++-- server/controller.go | 1 + server/database.go | 2 +- server/log.go | 4 ++-- server/version.go | 2 +- 14 files changed, 47 insertions(+), 41 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b386b5b..3b66ac2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,11 @@ _v6.4.4_ - Don't emit calls to listeners in separate GO routine to stay in sync with call ingestion. +_v6.4.5_ + +- SQL idle connections now expiring after 1 minute. +- Revert defer rows.Close() to simple rows.Close(). + ## Version 6.3 - Change scroll speed when drag droping talkgroups or units in a system (discussion #170). diff --git a/COMPILING.md b/COMPILING.md index 76c4041..cd93cc1 100644 --- a/COMPILING.md +++ b/COMPILING.md @@ -27,13 +27,13 @@ Clone the official repository on your computer and start the build process. When finished, you will find the precompiled versions for various platforms in the `dist` folder. - rdio-scanner-darwin-amd64-v6.4.4.zip - rdio-scanner-darwin-arm64-v6.4.4.zip - rdio-scanner-freebsd-amd64-v6.4.4.zip - rdio-scanner-linux-386-v6.4.4.zip - rdio-scanner-linux-amd64-v6.4.4.zip - rdio-scanner-linux-arm64-v6.4.4.zip - rdio-scanner-linux-arm-v6.4.4.zip - rdio-scanner-windows-amd64-v6.4.4.zip + rdio-scanner-darwin-amd64-v6.4.5.zip + rdio-scanner-darwin-arm64-v6.4.5.zip + rdio-scanner-freebsd-amd64-v6.4.5.zip + rdio-scanner-linux-386-v6.4.5.zip + rdio-scanner-linux-amd64-v6.4.5.zip + rdio-scanner-linux-arm64-v6.4.5.zip + rdio-scanner-linux-arm-v6.4.5.zip + rdio-scanner-windows-amd64-v6.4.5.zip **Happy Rdio scanning !** \ No newline at end of file diff --git a/Makefile b/Makefile index 556db0d..de67da2 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ app := rdio-scanner date := 2022/06/14 -ver := 6.4.4 +ver := 6.4.5 client := $(wildcard client/*.json client/*.ts) server := $(wildcard server/*.go) diff --git a/client/package-lock.json b/client/package-lock.json index 15fc6ea..1e476d9 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -1,12 +1,12 @@ { "name": "rdio-scanner", - "version": "6.4.4", + "version": "6.4.5", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "rdio-scanner", - "version": "6.4.4", + "version": "6.4.5", "license": "LICENSE", "dependencies": { "@angular/animations": "^13.3.10", diff --git a/client/package.json b/client/package.json index b43f21a..d0110a1 100644 --- a/client/package.json +++ b/client/package.json @@ -38,5 +38,5 @@ "build": "ng build --base-href ./ --configuration production", "start": "ng serve" }, - "version": "6.4.4" + "version": "6.4.5" } diff --git a/docs/platforms/darwin.md b/docs/platforms/darwin.md index 376e250..8c27313 100644 --- a/docs/platforms/darwin.md +++ b/docs/platforms/darwin.md @@ -42,8 +42,8 @@ ALWAYS DOWNLOAD THE LATEST VERSION OF [RDIO SCANNER](https://github.com/chuot/rd rdio@macos ~ % mkdir rdio-scanner rdio@macos ~ % cd rdio-scanner rdio@macos rdio-scanner % unzip \ - > ~/Downloads/rdio-scanner-darwin-arm64-v6.4.4.zip - Archive: /Users/rdio/Downloads/rdio-scanner-darwin-arm64-v6.4.4.zip + > ~/Downloads/rdio-scanner-darwin-arm64-v6.4.5.zip + Archive: /Users/rdio/Downloads/rdio-scanner-darwin-arm64-v6.4.5.zip inflating: rdio-scanner inflating: rdio-scanner.pdf @@ -51,7 +51,7 @@ ALWAYS DOWNLOAD THE LATEST VERSION OF [RDIO SCANNER](https://github.com/chuot/rd rdio@macos rdio-scanner % ./rdio-scanner - Rdio Scanner v6.4.4 + Rdio Scanner v6.4.5 ---------------------------------- 2022/06/14 08:38:06 server started 2022/06/14 08:38:06 main interface at http://macos.local:3000 @@ -77,7 +77,7 @@ Here we want our [Rdio Scanner](https://guthub.com/chuot/rdio-scanner) instance rdio@macos rdio-scanner % ./rdio-scanner --listen :80 - Rdio Scanner v6.4.4 + Rdio Scanner v6.4.5 ---------------------------------- 2022/06/14 08:48:03 server started 2022/06/14 08:48:03 main interface at http://macos.local @@ -95,7 +95,7 @@ You can use your own SSL certificates that match your domain name with `-ssl_cer > -ssl_key_file mykey.key \ > -ssl_listen :443 - Rdio Scanner v6.4.4 + Rdio Scanner v6.4.5 ---------------------------------- 2022/06/14 08:50:58 server started 2022/06/14 08:50:58 main interface at http://macos.local @@ -132,7 +132,7 @@ Then simply run [Rdio Scanner](https://github.com/chuot/rdio-scanner) without an rdio@macos rdio-scanner % ./rdio-scanner - Rdio Scanner v6.4.4 + Rdio Scanner v6.4.5 ---------------------------------- 2022/06/14 08:54:08 server started 2022/06/14 08:54:08 main interface at http://macos.local diff --git a/docs/platforms/freebsd.md b/docs/platforms/freebsd.md index 57efe5e..11a535e 100644 --- a/docs/platforms/freebsd.md +++ b/docs/platforms/freebsd.md @@ -42,8 +42,8 @@ ALWAYS DOWNLOAD THE LATEST VERSION OF [RDIO SCANNER](https://github.com/chuot/rd rdio@pc-freebsd:~ $ mkdir rdio-scanner rdio@pc-freebsd:~ $ cd rdio-scanner rdio@pc-freebsd:~/rdio-scanner $ unzip \ - > ~/rdio-scanner-freebsd-amd64-v6.4.4.zip - Archive: ../rdio-scanner-freebsd-amd64-v6.4.4.zip + > ~/rdio-scanner-freebsd-amd64-v6.4.5.zip + Archive: ../rdio-scanner-freebsd-amd64-v6.4.5.zip extracting: rdio-scanner extracting: rdio-scanner.pdf @@ -51,7 +51,7 @@ ALWAYS DOWNLOAD THE LATEST VERSION OF [RDIO SCANNER](https://github.com/chuot/rd rdio@pc-freebsd:~/rdio-scanner $ ./rdio-scanner - Rdio Scanner v6.4.4 + Rdio Scanner v6.4.5 ---------------------------------- 2022/06/14 08:16:36 server started 2022/06/14 08:16:36 main interface at http://pc-freebsd:3000 @@ -81,7 +81,7 @@ Here we want our [Rdio Scanner](https://guthub.com/chuot/rdio-scanner) instance Password: root@pc-freebsd:/home/rdio/rdio-scanner # ./rdio-scanner -listen :80 - Rdio Scanner v6.4.4 + Rdio Scanner v6.4.5 ---------------------------------- 2022/06/14 08:19:38 server started 2022/06/14 08:19:38 main interface at http://pc-freebsd @@ -101,7 +101,7 @@ You can use your own SSL certificates that match your domain name with `-ssl_cer > -ssl_key_file mykey.key \ > -ssl_listen :443 - Rdio Scanner v6.4.4 + Rdio Scanner v6.4.5 ---------------------------------- 2022/06/14 10:34:29 server started 2022/06/14 10:34:29 main interface at http://pc-freebsd @@ -142,7 +142,7 @@ Then simply run [Rdio Scanner](https://github.com/chuot/rdio-scanner) without an Password: root@pc-freebsd:/home/rdio/rdio-scanner # ./rdio-scanner - Rdio Scanner v6.4.4 + Rdio Scanner v6.4.5 ---------------------------------- 2022/06/14 10:38:28 server started 2022/06/14 10:38:29 main interface at http://pc-freebsd diff --git a/docs/platforms/linux.md b/docs/platforms/linux.md index 2fcb982..81e326e 100644 --- a/docs/platforms/linux.md +++ b/docs/platforms/linux.md @@ -42,8 +42,8 @@ ALWAYS DOWNLOAD THE LATEST VERSION OF [RDIO SCANNER](https://github.com/chuot/rd [rdio@pc-linux ~]$ mkdir rdio-scanner [rdio@pc-linux ~]$ cd rdio-scanner [rdio@pc-linux rdio-scanner]$ unzip \ - > ~/Downloads/rdio-scanner-linux-amd64-v6.4.4.zip - Archive: /home/rdio/Downloads/rdio-scanner-linux-amd64-v6.4.4.zip + > ~/Downloads/rdio-scanner-linux-amd64-v6.4.5.zip + Archive: /home/rdio/Downloads/rdio-scanner-linux-amd64-v6.4.5.zip inflating: rdio-scanner inflating: rdio-scanner.pdf @@ -51,7 +51,7 @@ ALWAYS DOWNLOAD THE LATEST VERSION OF [RDIO SCANNER](https://github.com/chuot/rd [rdio@pc-linux rdio-scanner]$ ./rdio-scanner - Rdio Scanner v6.4.4 + Rdio Scanner v6.4.5 ---------------------------------- 2022/06/14 09:11:48 server started 2022/06/14 09:11:48 main interface at http://pc-linux:3000 @@ -78,7 +78,7 @@ Here we want our [Rdio Scanner](https://guthub.com/chuot/rdio-scanner) instance [rdio@pc-linux rdio-scanner]$ sudo ./rdio-scanner -listen :80 [sudo] password for rdio: - Rdio Scanner v6.4.4 + Rdio Scanner v6.4.5 ---------------------------------- 2022/06/14 09:14:00 server started 2022/06/14 09:14:00 main interface at http://pc-linux @@ -97,7 +97,7 @@ You can use your own SSL certificates that match your domain name with `-ssl_cer > -ssl_listen :443 [sudo] password for rdio: - Rdio Scanner v6.4.4 + Rdio Scanner v6.4.5 ---------------------------------- 2022/06/14 09:16:47 server started 2022/06/14 09:16:47 main interface at http://pc-linux @@ -135,7 +135,7 @@ Then simply run [Rdio Scanner](https://github.com/chuot/rdio-scanner) without an [rdio@pc-linux rdio-scanner]$ sudo ./rdio-scanner [sudo] Mot de passe de rdio : - Rdio Scanner v6.4.4 + Rdio Scanner v6.4.5 ---------------------------------- 2022/06/14 09:20:40 server started 2022/06/14 09:20:40 main interface at http://pc-linux diff --git a/docs/platforms/windows.md b/docs/platforms/windows.md index 90a3f11..78df23c 100644 --- a/docs/platforms/windows.md +++ b/docs/platforms/windows.md @@ -44,7 +44,7 @@ ALWAYS DOWNLOAD THE LATEST VERSION OF [RDIO SCANNER](https://github.com/chuot/rd C:\Users\rdio> cd rdio-scanner C:\Users\rdio\rdio-scanner> tar -xvf ^ - ..\downloads\rdio-scanner-windows-amd64-v6.4.4.zip + ..\downloads\rdio-scanner-windows-amd64-v6.4.5.zip x rdio-scanner.exe x rdio-scanner.pdf @@ -52,7 +52,7 @@ ALWAYS DOWNLOAD THE LATEST VERSION OF [RDIO SCANNER](https://github.com/chuot/rd C:\Users\rdio\rdio-scanner>rdio-scanner - Rdio Scanner v6.4.4 + Rdio Scanner v6.4.5 ---------------------------------- 2022/06/14 13:48:48 server started 2022/06/14 13:48:48 main interface at http://pc-windows:3000 @@ -78,7 +78,7 @@ Here we want our [Rdio Scanner](https://guthub.com/chuot/rdio-scanner) instance C:\Users\rdio\rdio-scanner>rdio-scanner -listen :80 - Rdio Scanner v6.4.4 + Rdio Scanner v6.4.5 ---------------------------------- 2022/06/14 10:53:31 server started 2022/06/14 10:53:31 main interface at http://pc-windows @@ -96,7 +96,7 @@ You can use your own SSL certificates that match your domain name with `-ssl_cer -ssl_key_file meykey.key ^ -ssl_listen :443 - Rdio Scanner v6.4.4 + Rdio Scanner v6.4.5 ---------------------------------- 2022/06/14 11:05:43 server started 2022/06/14 11:05:43 main interface at http://pc-windows @@ -133,7 +133,7 @@ Then simply run [Rdio Scanner](https://github.com/chuot/rdio-scanner) without an C:\Users\rdio\rdio-scanner>rdio-scanner - Rdio Scanner v6.4.4 + Rdio Scanner v6.4.5 ---------------------------------- 2022/06/14 11:11:28 server started 2022/06/14 11:11:28 main interface at http://pc-windows diff --git a/server/call.go b/server/call.go index c4261ad..e98f99b 100644 --- a/server/call.go +++ b/server/call.go @@ -393,8 +393,6 @@ func (calls *Calls) Search(searchOptions *CallsSearchOptions, client *Client) (* return nil, formatError(fmt.Errorf("%v, %v", err, query)) } - defer rows.Close() - for rows.Next() { searchResult := CallsSearchResult{} if err = rows.Scan(&id, &dateTime, &searchResult.System, &searchResult.Talkgroup); err != nil { @@ -415,6 +413,8 @@ func (calls *Calls) Search(searchOptions *CallsSearchOptions, client *Client) (* searchResults.Results = append(searchResults.Results, searchResult) } + rows.Close() + if err != nil { return nil, formatError(err) } diff --git a/server/controller.go b/server/controller.go index f5e5942..c3dd52c 100644 --- a/server/controller.go +++ b/server/controller.go @@ -343,6 +343,7 @@ func (controller *Controller) ProcessMessage(client *Client, message *Message) e } else if message.Command == MessageCommandConfig { client.SendConfig(controller.Groups, controller.Options, controller.Systems, controller.Tags) + client.SendListenersCount(controller.Clients.Count()) } else if message.Command == MessageCommandListCall { if err := controller.ProcessMessageCommandListCall(client, message); err != nil { diff --git a/server/database.go b/server/database.go index bca2096..ed284e4 100644 --- a/server/database.go +++ b/server/database.go @@ -61,7 +61,7 @@ func NewDatabase(config *Config) *Database { log.Fatalf("unknown database type %s\n", config.DbType) } - database.Sql.SetConnMaxLifetime(0) + database.Sql.SetConnMaxLifetime(time.Minute) database.Sql.SetMaxIdleConns(25) database.Sql.SetMaxOpenConns(25) diff --git a/server/log.go b/server/log.go index f53efb4..d3ffc3f 100644 --- a/server/log.go +++ b/server/log.go @@ -202,8 +202,6 @@ func (logs *Logs) Search(searchOptions *LogsSearchOptions, db *Database) (*LogsS return nil, formatError(fmt.Errorf("%v, %v", err, query)) } - defer rows.Close() - for rows.Next() { log := Log{} @@ -224,6 +222,8 @@ func (logs *Logs) Search(searchOptions *LogsSearchOptions, db *Database) (*LogsS logResults.Logs = append(logResults.Logs, log) } + rows.Close() + if err != nil { return nil, formatError(err) } diff --git a/server/version.go b/server/version.go index 903aabe..70b2904 100644 --- a/server/version.go +++ b/server/version.go @@ -15,4 +15,4 @@ package main -const Version = "6.4.4" +const Version = "6.4.5"