-
-
Notifications
You must be signed in to change notification settings - Fork 5.8k
Allow common redis and leveldb connections #12385
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
8bc34e4
Allow common redis and leveldb connections
zeripath d9c166b
Merge remote-tracking branch 'origin/master' into common-nosql
zeripath b83cac1
add unit-test
zeripath 965686f
as per @lunny
zeripath 91fd0c5
add test
zeripath 360fd71
Merge branch 'master' into common-nosql
techknowlogick ec1c5fa
Merge branch 'master' into common-nosql
lafriks 6d3765a
Update modules/cache/cache_redis.go
lafriks 0886903
Update modules/queue/queue_disk.go
lafriks 397866a
Update modules/cache/cache_redis.go
lafriks 6c70fbd
Update modules/cache/cache_redis.go
lafriks 8e0ab2d
Update modules/queue/unique_queue_disk.go
lafriks 85b5531
Update modules/queue/queue_disk.go
lafriks ca19139
Update modules/queue/unique_queue_disk.go
lafriks 051aa3f
Update modules/session/redis.go
lafriks File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| // Copyright 2020 The Gitea Authors. All rights reserved. | ||
| // Use of this source code is governed by a MIT-style | ||
| // license that can be found in the LICENSE file. | ||
|
|
||
| package nosql | ||
|
|
||
| import "net/url" | ||
|
|
||
| // ToLevelDBURI converts old style connections to a LevelDBURI | ||
| // | ||
| // A LevelDBURI matches the pattern: | ||
| // | ||
| // leveldb://path[?[option=value]*] | ||
| // | ||
| // We have previously just provided the path but this prevent other options | ||
| func ToLevelDBURI(connection string) *url.URL { | ||
| uri, err := url.Parse(connection) | ||
| if err == nil && uri.Scheme == "leveldb" { | ||
| return uri | ||
| } | ||
| uri, _ = url.Parse("leveldb://common") | ||
| uri.Host = "" | ||
| uri.Path = connection | ||
| return uri | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| // Copyright 2020 The Gitea Authors. All rights reserved. | ||
| // Use of this source code is governed by a MIT-style | ||
| // license that can be found in the LICENSE file. | ||
|
|
||
| package nosql | ||
|
|
||
| import ( | ||
| "strconv" | ||
| "sync" | ||
| "time" | ||
|
|
||
| "github.com/go-redis/redis/v7" | ||
| "github.com/syndtr/goleveldb/leveldb" | ||
| ) | ||
|
|
||
| var manager *Manager | ||
|
|
||
| // Manager is the nosql connection manager | ||
| type Manager struct { | ||
| mutex sync.Mutex | ||
|
|
||
| RedisConnections map[string]*redisClientHolder | ||
| LevelDBConnections map[string]*levelDBHolder | ||
| } | ||
|
|
||
| type redisClientHolder struct { | ||
| redis.UniversalClient | ||
| name []string | ||
| count int64 | ||
| } | ||
|
|
||
| func (r *redisClientHolder) Close() error { | ||
| return manager.CloseRedisClient(r.name[0]) | ||
| } | ||
|
|
||
| type levelDBHolder struct { | ||
| name []string | ||
| count int64 | ||
| db *leveldb.DB | ||
| } | ||
|
|
||
| func init() { | ||
| _ = GetManager() | ||
| } | ||
|
|
||
| // GetManager returns a Manager and initializes one as singleton is there's none yet | ||
| func GetManager() *Manager { | ||
| if manager == nil { | ||
| manager = &Manager{ | ||
| RedisConnections: make(map[string]*redisClientHolder), | ||
| LevelDBConnections: make(map[string]*levelDBHolder), | ||
| } | ||
| } | ||
| return manager | ||
| } | ||
|
|
||
| func valToTimeDuration(vs []string) (result time.Duration) { | ||
| var err error | ||
| for _, v := range vs { | ||
| result, err = time.ParseDuration(v) | ||
| if err != nil { | ||
| var val int | ||
| val, err = strconv.Atoi(v) | ||
| result = time.Duration(val) | ||
| } | ||
| if err == nil { | ||
| return | ||
| } | ||
| } | ||
| return | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.