|
4 | 4 | package cache |
5 | 5 |
|
6 | 6 | import ( |
7 | | - "fmt" |
8 | 7 | "strconv" |
| 8 | + "time" |
9 | 9 |
|
10 | 10 | "code.gitea.io/gitea/modules/setting" |
11 | | - |
12 | | - mc "gitea.com/go-chi/cache" |
13 | | - |
14 | | - _ "gitea.com/go-chi/cache/memcache" // memcache plugin for cache |
15 | 11 | ) |
16 | 12 |
|
17 | | -var conn mc.Cache |
18 | | - |
19 | | -func newCache(cacheConfig setting.Cache) (mc.Cache, error) { |
20 | | - return mc.NewCacher(mc.Options{ |
21 | | - Adapter: cacheConfig.Adapter, |
22 | | - AdapterConfig: cacheConfig.Conn, |
23 | | - Interval: cacheConfig.Interval, |
24 | | - }) |
25 | | -} |
| 13 | +var defaultCache StringCache |
26 | 14 |
|
27 | 15 | // Init start cache service |
28 | 16 | func Init() error { |
29 | | - var err error |
30 | | - |
31 | | - if conn == nil { |
32 | | - if conn, err = newCache(setting.CacheService.Cache); err != nil { |
| 17 | + if defaultCache == nil { |
| 18 | + c, err := NewStringCache(setting.CacheService.Cache) |
| 19 | + if err != nil { |
33 | 20 | return err |
34 | 21 | } |
35 | | - if err = conn.Ping(); err != nil { |
| 22 | + for i := 0; i < 10; i++ { |
| 23 | + if err = c.Ping(); err == nil { |
| 24 | + break |
| 25 | + } |
| 26 | + time.Sleep(time.Second) |
| 27 | + } |
| 28 | + if err != nil { |
36 | 29 | return err |
37 | 30 | } |
| 31 | + defaultCache = c |
38 | 32 | } |
39 | | - |
40 | | - return err |
| 33 | + return nil |
41 | 34 | } |
42 | 35 |
|
43 | 36 | // GetCache returns the currently configured cache |
44 | | -func GetCache() mc.Cache { |
45 | | - return conn |
| 37 | +func GetCache() StringCache { |
| 38 | + return defaultCache |
46 | 39 | } |
47 | 40 |
|
48 | 41 | // GetString returns the key value from cache with callback when no key exists in cache |
49 | 42 | func GetString(key string, getFunc func() (string, error)) (string, error) { |
50 | | - if conn == nil || setting.CacheService.TTL == 0 { |
| 43 | + if defaultCache == nil || setting.CacheService.TTL == 0 { |
51 | 44 | return getFunc() |
52 | 45 | } |
53 | | - |
54 | | - cached := conn.Get(key) |
55 | | - |
56 | | - if cached == nil { |
| 46 | + cached, exist := defaultCache.Get(key) |
| 47 | + if !exist { |
57 | 48 | value, err := getFunc() |
58 | 49 | if err != nil { |
59 | 50 | return value, err |
60 | 51 | } |
61 | | - return value, conn.Put(key, value, setting.CacheService.TTLSeconds()) |
62 | | - } |
63 | | - |
64 | | - if value, ok := cached.(string); ok { |
65 | | - return value, nil |
66 | | - } |
67 | | - |
68 | | - if stringer, ok := cached.(fmt.Stringer); ok { |
69 | | - return stringer.String(), nil |
70 | | - } |
71 | | - |
72 | | - return fmt.Sprintf("%s", cached), nil |
73 | | -} |
74 | | - |
75 | | -// GetInt returns key value from cache with callback when no key exists in cache |
76 | | -func GetInt(key string, getFunc func() (int, error)) (int, error) { |
77 | | - if conn == nil || setting.CacheService.TTL == 0 { |
78 | | - return getFunc() |
79 | | - } |
80 | | - |
81 | | - cached := conn.Get(key) |
82 | | - |
83 | | - if cached == nil { |
84 | | - value, err := getFunc() |
85 | | - if err != nil { |
86 | | - return value, err |
87 | | - } |
88 | | - |
89 | | - return value, conn.Put(key, value, setting.CacheService.TTLSeconds()) |
90 | | - } |
91 | | - |
92 | | - switch v := cached.(type) { |
93 | | - case int: |
94 | | - return v, nil |
95 | | - case string: |
96 | | - value, err := strconv.Atoi(v) |
97 | | - if err != nil { |
98 | | - return 0, err |
99 | | - } |
100 | | - return value, nil |
101 | | - default: |
102 | | - value, err := getFunc() |
103 | | - if err != nil { |
104 | | - return value, err |
105 | | - } |
106 | | - return value, conn.Put(key, value, setting.CacheService.TTLSeconds()) |
| 52 | + return value, defaultCache.Put(key, value, setting.CacheService.TTLSeconds()) |
107 | 53 | } |
| 54 | + return cached, nil |
108 | 55 | } |
109 | 56 |
|
110 | 57 | // GetInt64 returns key value from cache with callback when no key exists in cache |
111 | 58 | func GetInt64(key string, getFunc func() (int64, error)) (int64, error) { |
112 | | - if conn == nil || setting.CacheService.TTL == 0 { |
113 | | - return getFunc() |
114 | | - } |
115 | | - |
116 | | - cached := conn.Get(key) |
117 | | - |
118 | | - if cached == nil { |
119 | | - value, err := getFunc() |
120 | | - if err != nil { |
121 | | - return value, err |
122 | | - } |
123 | | - |
124 | | - return value, conn.Put(key, value, setting.CacheService.TTLSeconds()) |
| 59 | + s, err := GetString(key, func() (string, error) { |
| 60 | + v, err := getFunc() |
| 61 | + return strconv.FormatInt(v, 10), err |
| 62 | + }) |
| 63 | + if err != nil { |
| 64 | + return 0, err |
125 | 65 | } |
126 | | - |
127 | | - switch v := conn.Get(key).(type) { |
128 | | - case int64: |
129 | | - return v, nil |
130 | | - case string: |
131 | | - value, err := strconv.ParseInt(v, 10, 64) |
132 | | - if err != nil { |
133 | | - return 0, err |
134 | | - } |
135 | | - return value, nil |
136 | | - default: |
137 | | - value, err := getFunc() |
138 | | - if err != nil { |
139 | | - return value, err |
140 | | - } |
141 | | - |
142 | | - return value, conn.Put(key, value, setting.CacheService.TTLSeconds()) |
| 66 | + if s == "" { |
| 67 | + return 0, nil |
143 | 68 | } |
| 69 | + return strconv.ParseInt(s, 10, 64) |
144 | 70 | } |
145 | 71 |
|
146 | 72 | // Remove key from cache |
147 | 73 | func Remove(key string) { |
148 | | - if conn == nil { |
| 74 | + if defaultCache == nil { |
149 | 75 | return |
150 | 76 | } |
151 | | - _ = conn.Delete(key) |
| 77 | + _ = defaultCache.Delete(key) |
152 | 78 | } |
0 commit comments