about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--cache.go41
-rw-r--r--http.go2
2 files changed, 28 insertions, 15 deletions
diff --git a/cache.go b/cache.go
index 88d5dba..e26eed3 100644
--- a/cache.go
+++ b/cache.go
@@ -24,25 +24,37 @@ var cache = &cacheWrapper{
 	pages: make(map[string]*page),
 }
 
-func bapCache(requestPath string) {
-	cache.RLock()
-	if cache.pages[requestPath] == nil {
-		cache.RUnlock()
-		cacheIndex()
-		return
+// Wraps the two cache-checking functions.
+// One for /, the other for various requests.
+func (cache *cacheWrapper) bap(requestPath string) {
+	switch requestPath {
+	case "/":
+		bapIndex()
+	default:
+	}
+}
+
+// Checks if cache either has expired or has nil copy of
+// the index. If so, it yoinks the page from disk and
+// sets the expiration time.
+func bapIndex() {
+	if cache.pages["/"] == nil {
+		cache.Lock()
+		cache.pages["/"] = &page{
+			raw:     []byte{},
+			expires: time.Time{},
+		}
+		cache.Unlock()
 	}
 
-	expires := cache.pages[requestPath].expires
+	cache.RLock()
+	expires := cache.pages["/"].expires
 	cache.RUnlock()
 
-	if time.Now().After(expires) {
-		cacheIndex()
+	if time.Now().Before(expires) {
+		return
 	}
-}
 
-// Pulls the index page from disk and places it into the cache.
-// etag is an fnv32 hash of the raw file bytes, truncated if necessary.
-func cacheIndex() {
 	bytes, err := ioutil.ReadFile("web/index.txt")
 	if err != nil {
 		log.Printf("Could not read index page: %s", err.Error())
@@ -50,9 +62,10 @@ func cacheIndex() {
 	}
 
 	cache.Lock()
+	defer cache.Unlock()
+
 	cache.pages["/"] = &page{
 		raw:     bytes,
 		expires: time.Now().Add(5 * time.Minute),
 	}
-	cache.Unlock()
 }
diff --git a/http.go b/http.go
index 93b6d0c..2350bea 100644
--- a/http.go
+++ b/http.go
@@ -78,7 +78,7 @@ func routingHop(r *http.Request) string {
 
 // Yeets the index/summary page to the user
 func indexHandler(w http.ResponseWriter, r *http.Request) {
-	bapCache("/")
+	cache.bap("/")
 	cache.RLock()
 	defer cache.RUnlock()
 
tter bptato <nincsnevem662@gmail.com> 2023-12-13 12:56:28 +0100 Move http out of main binary' href='/ahoang/chawan/commit/doc/localcgi.md?id=ab203acf554993d15e37604773f160c84b4d8252'>ab203acf ^
189e73f7 ^




db98b828 ^
189e73f7 ^

ab203acf ^


















8048a943 ^





















ab203acf ^
b0547ba9 ^


8048a943 ^


ab203acf ^




8048a943 ^


4eb57c2b ^



84ebec21 ^

4eb57c2b ^






3c156384 ^
4eb57c2b ^












8048a943 ^




1a50291c ^


8048a943 ^
b0547ba9 ^











8048a943 ^









84ebec21 ^






8048a943 ^




84ebec21 ^
8048a943 ^

84ebec21 ^


8048a943 ^
aad2c986 ^




8048a943 ^










10002a45 ^




8048a943 ^
8048a943 ^



136d8d9e ^





1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244