Hapi v2 rebased

bin/key_server.js

@@ -31,7 +31,7 @@ function main() {
   )
   memoryMonitor.start()
 
-  var error = require('../error')(log)
+  var error = require('../error')
   var Token = require('../tokens')(log, config.tokenLifetimes)
   var i18n = require('../i18n')(config.i18n)
 
@@ -53,7 +53,7 @@ function main() {
   var DB = require('../db')(
     config.db.backend,
     log,
-    Token.error,
+    error,
     Token.SessionToken,
     Token.KeyFetchToken,
     Token.AccountResetToken,

bin/mail_helper.js

@@ -82,21 +82,21 @@ api.route(
     {
       method: 'GET',
       path: '/mail/{email}',
-      handler: function (request) {
+      handler: function (request, reply) {
         loop(
           request.params.email,
           function (emailData) {
-            request.reply(emailData)
+            reply(emailData)
           }
         )
       }
     },
     {
       method: 'DELETE',
       path: '/mail/{email}',
-      handler: function (request) {
+      handler: function (request, reply) {
         delete users[request.params.email]
-        request.reply()
+        reply()
       }
     }
   ]