From ee57e351d2287d12188e18d1b422e2125a2fe4d6 Mon Sep 17 00:00:00 2001
From: Brad Fitzpatrick <brad@danga.com>
Date: Thu, 24 Oct 2013 22:49:18 -0700
Subject: [PATCH] Remove debug cruft actually submitted.

Change-Id: Iaa805afd2d6e76108319edf06113de8a260f7e46
---
 pkg/schema/sign.go               | 1 -
 pkg/serverconfig/serverconfig.go | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkg/schema/sign.go b/pkg/schema/sign.go
index 793daf791..3797a0da2 100644
--- a/pkg/schema/sign.go
+++ b/pkg/schema/sign.go
@@ -52,7 +52,6 @@ func (s *Signer) String() string {
 func NewSigner(pubKeyRef blob.Ref, armoredPubKey io.Reader, privateKeySource interface{}) (*Signer, error) {
 	hash := pubKeyRef.Hash()
 	keyId, armoredPubKeyString, err := jsonsign.ParseArmoredPublicKey(io.TeeReader(armoredPubKey, hash))
-	println("keyId = ", keyId)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/serverconfig/serverconfig.go b/pkg/serverconfig/serverconfig.go
index fb283d02c..5febf3883 100644
--- a/pkg/serverconfig/serverconfig.go
+++ b/pkg/serverconfig/serverconfig.go
@@ -381,10 +381,10 @@ func (config *Config) checkValidAuth() error {
 // handlers.
 func (config *Config) InstallHandlers(hi HandlerInstaller, baseURL string, context *http.Request) (shutdown io.Closer, err error) {
 	defer func() {
-		//if e := recover(); e != nil {
-		//if fmt.Sprint(e) == "TODO" {
-		//err = fmt.Errorf("Caught panic: %v", e)
-		///		}
+		if e := recover(); e != nil {
+			log.Printf("Caught panic installer handlers: %v", e)
+			err = fmt.Errorf("Caught panic: %v", e)
+		}
 	}()
 
 	if err := config.checkValidAuth(); err != nil {