Merge pull request #44 from tmpMeM/main

v0.2.2 debug
AnnonaOrg · Sep 19, 2024 · b951ee9 · b951ee9
2 parents 9261be1 + 6519309
commit b951ee9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/AnnonaOrg/annona_client
 go 1.21.6
 
 require (
-	github.com/AnnonaOrg/osenv v0.1.11
+	github.com/AnnonaOrg/osenv v0.1.15
 	github.com/go-telegram-bot-api/telegram-bot-api/v5 v5.5.1
 	github.com/redis/go-redis/v9 v9.4.0
 	github.com/sirupsen/logrus v1.9.3

diff --git a/go.sum b/go.sum
@@ -6,6 +6,8 @@ github.com/AnnonaOrg/osenv v0.0.19 h1:oLfBc6B/Yg6UQUYdb0hJqamdu93GG7PH2i8mzRtOHi
 github.com/AnnonaOrg/osenv v0.0.19/go.mod h1:s7SfWcnwh1NBcHGVK8xFR1DcySlHEf5Ya0dOnLsn2Zk=
 github.com/AnnonaOrg/osenv v0.1.11 h1:illZJ+1ht0QLAiXJ8GMz5Om9UgaKEVMiVkRsWS1wvLs=
 github.com/AnnonaOrg/osenv v0.1.11/go.mod h1:s7SfWcnwh1NBcHGVK8xFR1DcySlHEf5Ya0dOnLsn2Zk=
+github.com/AnnonaOrg/osenv v0.1.15 h1:zuUzmBnzrGtof87uRooUNFGqBSBCdL/FWGAQxtWia4I=
+github.com/AnnonaOrg/osenv v0.1.15/go.mod h1:s7SfWcnwh1NBcHGVK8xFR1DcySlHEf5Ya0dOnLsn2Zk=
 github.com/AnnonaOrg/pkg/send2server v0.0.0-20240116163056-658c3872f80a h1:exNlTHfMl2kP65Rh/Axz6sa8bsfQc0iub7/Brhc1rlY=
 github.com/AnnonaOrg/pkg/send2server v0.0.0-20240116163056-658c3872f80a/go.mod h1:8mX+fHriBSKP9tnYCvm5p/wArtwZledJZRhoFQCeTZg=
 github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=

diff --git a/internal/dbredis/init.go b/internal/dbredis/init.go
@@ -17,6 +17,9 @@ var (
 func GetRedisOptions() Options {
 	options := DefaultOptions
 	options.Address = osenv.GetServerDbRedisAddress()
+	if pw := osenv.GetServerDbRedisPassword(); len(pw) > 0 {
+		options.Password = pw
+	}
 	return options
 }