Skip to content

Commit bdd36ec

Browse files
committed
use redis
1 parent 57ae0cb commit bdd36ec

File tree

6 files changed

+19
-18
lines changed

6 files changed

+19
-18
lines changed

.Procfile

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
local: ForrestFire
2+
memcached: memcached
3+
redis: redis-server --port 6380 --requirepass password

Godeps

+5-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
},
2626
{
2727
"ImportPath": "github.com/darkhelmet/tinderizer",
28-
"Rev": "420d24d5114fdbbe997751c0c7c2dbf40e5b1a4a"
28+
"Rev": "eb1488abe1be4fa2873a6975c33131be1b613dea"
2929
},
3030
{
3131
"ImportPath": "github.com/darkhelmet/webcompiler",
@@ -50,6 +50,10 @@
5050
{
5151
"ImportPath": "github.com/pkulak/simpletransport/simpletransport",
5252
"Rev": "bde1212ee868cd4aa6c594857d201775aa47fe98"
53+
},
54+
{
55+
"ImportPath": "github.com/xuyu/goredis",
56+
"Rev": "1097760f0a8ccd0763b59ddcd5278cea21122e13"
5357
}
5458
]
5559
}

Makefile

-7
This file was deleted.

Procfile

-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
web: ./bin/ForrestFire
2-
local: ForrestFire

app.go

+3-9
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,9 @@ var (
6060
type JSON map[string]interface{}
6161

6262
func init() {
63-
memcacheServers := env.StringDefault("MEMCACHIER_SERVERS", "")
64-
if memcacheServers != "" {
65-
memcacheUsername := env.StringDefault("MEMCACHIER_USERNAME", "")
66-
memcachePassword := env.StringDefault("MEMCACHIER_PASSWORD", "")
67-
cache.SetupMemcache(memcacheServers, memcacheUsername, memcachePassword)
63+
redis := env.StringDefault("REDISCLOUD_URL", "")
64+
if redis != "" {
65+
cache.SetupRedis(redis, "timeout=2s&maxidle=1")
6866
}
6967

7068
rdbToken := env.String("READABILITY_TOKEN")
@@ -288,18 +286,14 @@ func HandleSubmitError(encoder *json.Encoder, err error) {
288286
}
289287

290288
func Submit(encoder *json.Encoder, email, url, content string) {
291-
logger.Printf("Submit")
292289
job, err := J.New(email, url, content)
293290
if err != nil {
294291
HandleSubmitError(encoder, err)
295292
return
296293
}
297294

298-
logger.Printf("setting progress")
299295
job.Progress("Working...")
300-
logger.Printf("queuing")
301296
app.Queue(*job)
302-
logger.Printf("encoding")
303297
encoder.Encode(JSON{
304298
"message": "Submitted! Hang tight...",
305299
"id": job.Key.String(),

rc

+8
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,11 @@ deps() {
1313
logs() {
1414
heroku logs --tail
1515
}
16+
17+
run() {
18+
go get -v && foreman start -f .Procfile
19+
}
20+
21+
test() {
22+
curl "http://tinderizer.dev:3000/ajax/[email protected]&url=http://verboselogging.com/2012/11/08/rubyconf-mission-complete"
23+
}

0 commit comments

Comments
 (0)