Permalink
Browse files

Merge branch 'move-pred'

Conflicts:
	src/pulse/def.clj
  • Loading branch information...
2 parents 90c0774 + 1702915 commit 504dc5da986daa34623db341e77726b4858c96dc @technomancy technomancy committed Oct 2, 2012
Showing with 63 additions and 281 deletions.
  1. +2 −2 .gitignore
  2. +2 −6 Readme.md
  3. +3 −4 src/pulse/conf.clj
  4. +54 −267 src/pulse/def.clj
  5. +1 −1 src/pulse/merger.clj
  6. +1 −1 src/pulse/receiver.clj
View
@@ -1,9 +1,9 @@
.env*
-!.end.sample
+!.env.sample
lib
*.xml
*.jar
classes
.lein-deps-sum
/.lein-plugins/checksum
-/target/stale/dependencies
+/target
View
@@ -42,15 +42,11 @@ $ heroku create pulse-$DEPLOY -s cedar
$ heroku addons:add redistogo:large -r $DEPLOY
$ heroku config:add BUILDPACK_URL=https://github.com/heroku/heroku-buildpack-clojure.git -r $DEPLOY
$ heroku config:add DEPLOY=$DEPLOY -r $DEPLOY
-$ heroku config:add CLOUD=heroku.com -r $DEPLOY
-$ heroku config:add FORCE_HTTPS=true -r $DEPLOY
-$ heroku config:add GRAPHITE_PERIOD=21600 -r $DEPLOY
+$ heroku config:add CLOUDS=heroku.com -r $DEPLOY
$ heroku config:add PUBLISH_THREADS=2 -r $DEPLOY
-$ heroku config:add GRAPHITE_URL=... -r $DEPLOY
-$ heroku config:add SCALES_URL=... -r $DEPLOY
+$ heroku config:add METRICS_URL=... -r $DEPLOY
$ heroku config:add REDIS_URL=... -r $DEPLOY
$ heroku config:add AORTA_URLS=... -r $DEPLOY
-$ heroku config:add METRICS_URLS=... -r $DEPLOY
$ git push $DEPLOY master
$ heroku scale receiver=60 merger0=1 merger1=1 merger2=1 merger3=1 merger4=1 emitter=1 -r $DEPLOY
View
@@ -16,7 +16,6 @@
(defn clouds [] (str/split (env! "CLOUDS") #","))
(defn default-cloud [] (or (env "DEFAULT_CLOUD") (first (clouds))))
(defn canonical-host [] (env! "CANONICAL_HOST"))
-(defn graphite-url [] (env! "GRAPHITE_URL"))
-(defn graphite-period [] (env! "GRAPHITE_PERIOD"))
-(defn publish-threads [] (Integer/parseInt (env! "PUBLISH_THREADS")))
-(defn merger-count [] 5)
+(defn publish-threads [] (Integer. (env! "PUBLISH_THREADS")))
+(defn merger-count [] (Integer. (or (env "MERGER_COUNT") 5)))
+(defn graphite-prefix [] (env "GRAPHITE_PREFIX")) ; for staging deploys
Oops, something went wrong.

0 comments on commit 504dc5d

Please sign in to comment.