Merge pull request #12 from peterbe/dont-defer-panic-certain-things

dont defer panic certain things
peterbe · Sep 8, 2015 · 6d140ec · 6d140ec
2 parents 74d6e94 + b35779a
commit 6d140ec
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@ cover.out
 gin-bin
 /server
 /autocompeter
+/run-dev-server.sh
diff --git a/sampleloader/README.md b/sampleloader/README.md
@@ -4,7 +4,7 @@ autocompeter.com home page.
 
 How I load in all blog posts for local development:
 
-    ./populate.py --flush -d 8 --destination="http://localhost:3000" --domain="localhost:3000" --bulk
+    ./populate.py --flush -d 8 --destination="http://localhost:3000" --domain="localhost:3000"
 
 
 Then to check it run:

diff --git a/server.go b/server.go
@@ -375,8 +375,8 @@ func main() {
 	mux.HandleFunc("/login", dfs.HTTPHandler(handleGitHubLogin)).Methods("GET")
 	mux.HandleFunc("/logout", dfs.HTTPHandler(logoutHandler)).Methods("GET", "POST")
 	mux.HandleFunc("/github_oauth_cb", dfs.HTTPHandler(handleGitHubCallback)).Methods("GET")
-	mux.HandleFunc("/domainkeys/new", dfs.HTTPHandler(domainkeyNewHandler)).Methods("POST")
-	mux.HandleFunc("/domainkeys/delete", dfs.HTTPHandler(domainkeyDeleteHandler)).Methods("POST")
+	mux.HandleFunc("/domainkeys/new", domainkeyNewHandler).Methods("POST")
+	mux.HandleFunc("/domainkeys/delete", domainkeyDeleteHandler).Methods("POST")
 
 	n := negroni.Classic()
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,3 +5,4 @@ cover.out @@
     gin-bin
     /server
     /autocompeter
+    /run-dev-server.sh