CHANGELOG.md

@@ -11,19 +11,6 @@ Before any major/minor/patch bump all unit tests will be run to verify they pass
 
 -   [x]
 
-# [0.3.0] - 2025-04-05
-
-### Changed
-
--   `-loglevel` flag is now of type string. It accepts any one of trace, debug, info, warn, error, fatal or panic.
-    -   It defaults to warn.
-
-# [0.2.0] - 2025-02-03
-
-### Added
-
--   If neither the interactive flag is passed or any command line arguments then a *rcon status* command will be run.
-
 # [0.1.0] - 2024-11-29
 
 ### Changed

README.md

@@ -109,7 +109,7 @@ Arguments following the flags will be sent as rcon commands. You may send multip
 
 Pass `interactive (-i shorthand)` flag to enable interactive mode, for example:
 
-```bash
+```
 q3rcon -h=localhost -p=30000 -r="rconpassword" -i
 ```
 
@@ -123,31 +123,16 @@ Since you can include the q3rcon package into your own package you can easily ma
 
 ## Logging
 
-The `-loglevel` flag allows you to control the verbosity of the application's logging output. 
+Log level may be set by passing the `-l` flag with a number from 0 up to 6 where
 
-Acceptable values for this flag are:
+0 = Panic, 1 = Fatal, 2 = Error, 3 = Warning, 4 = Info, 5 = Debug, 6 = Trace
 
-- `trace`
-- `debug`
-- `info`
-- `warn`
-- `error`
-- `fatal`
-- `panic`
-
-For example, to set the log level to `debug`, you can use:
-
-```bash
-q3rcon -p=28960 -r="rconpassword" -loglevel=debug -i
-```
-
-The default log level is `warn` if the flag is not specified.
+[status]: ./img/status.png
+[mapname]: ./img/mapname.png
 
 ## Further Notes
 
 This rcon client is fully compatible with the [Q3 Rcon Proxy][q3rcon-proxy] package.
 
 
-[status]: ./img/status.png
-[mapname]: ./img/mapname.png
 [q3rcon-proxy]: https://github.com/onyx-and-iris/q3rcon-proxy/tree/dev

cmd/q3rcon/main.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"slices"
 	"strings"
 
 	"github.com/onyx-and-iris/q3rcon"
@@ -24,7 +25,7 @@ func main() {
 		port        int
 		rconpass    string
 		interactive bool
-		loglevel    string
+		loglevel    int
 	)
 
 	flag.StringVar(&host, "host", "localhost", "hostname of the gameserver")
@@ -37,16 +38,13 @@ func main() {
 	flag.BoolVar(&interactive, "interactive", false, "run in interactive mode")
 	flag.BoolVar(&interactive, "i", false, "run in interactive mode")
 
-	flag.StringVar(&loglevel, "loglevel", "warn", "log level")
-	flag.StringVar(&loglevel, "l", "warn", "log level (shorthand)")
-
+	flag.IntVar(&loglevel, "loglevel", int(log.WarnLevel), "log level")
+	flag.IntVar(&loglevel, "l", int(log.WarnLevel), "log level (shorthand)")
 	flag.Parse()
 
-	level, err := log.ParseLevel(loglevel)
-	if err != nil {
-		exitOnError(fmt.Errorf("invalid log level: %s", loglevel))
+	if slices.Contains(log.AllLevels, log.Level(loglevel)) {
+		log.SetLevel(log.Level(loglevel))
 	}
-	log.SetLevel(level)
 
 	if port < 1024 || port > 65535 {
 		exitOnError(fmt.Errorf("invalid port value, got: (%d) expected: in range 1024-65535", port))

go.mod

@@ -4,4 +4,4 @@ go 1.23.0
 
 require github.com/sirupsen/logrus v1.9.3
 
-require golang.org/x/sys v0.32.0 // indirect
+require golang.org/x/sys v0.25.0 // indirect

go.sum

@@ -9,8 +9,8 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
-golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
+golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

internal/packet/request.go

@@ -3,8 +3,6 @@ package packet
 import (
 	"bytes"
 	"fmt"
-
-	log "github.com/sirupsen/logrus"
 )
 
 const bufSz = 512
@@ -31,6 +29,5 @@ func (r Request) Encode(cmd string) []byte {
 	r.buf.Reset()
 	r.buf.Write(r.Header())
 	r.buf.WriteString(fmt.Sprintf(" %s %s", r.password, cmd))
-	log.Tracef("Encoded request: %s", r.buf.String())
 	return r.buf.Bytes()
 }