From 0dddffbbeda387c4dca2d737227a661d033c32c6 Mon Sep 17 00:00:00 2001
From: Zachary Carter <zack.carter@gmail.com>
Date: Mon, 2 Jul 2012 11:36:57 -0700
Subject: [PATCH] Clean up warnings in some of the bin processes
---
bin/browserid | 4 ++--
bin/dbwriter | 10 +++++-----
bin/keysigner | 2 +-
bin/router | 4 ++--
bin/verifier | 6 +++---
5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/bin/browserid b/bin/browserid
index 3e88bd93f..c7bc941cf 100755
--- a/bin/browserid
+++ b/bin/browserid
@@ -180,9 +180,9 @@ db.open(config.get('database'), function (error) {
logger.error("error creating test users - bcrypt encrypt pass: " + err);
process.exit(1);
}
- var want = parseInt(process.env['CREATE_TEST_USERS']);
+ var want = parseInt(process.env['CREATE_TEST_USERS'], 10);
var have = 0;
- for (i = 1; i <= want; i++) {
+ for (var i = 1; i <= want; i++) {
db.addTestUser(i + "@loadtest.domain", hash, function(err, email) {
if (++have == want) {
logger.warn("created " + want + " test users");
diff --git a/bin/dbwriter b/bin/dbwriter
index c629863e2..f50e577de 100755
--- a/bin/dbwriter
+++ b/bin/dbwriter
@@ -8,13 +8,13 @@ const
fs = require('fs'),
path = require('path'),
url = require('url'),
-http = require('http');
+http = require('http'),
urlparse = require('urlparse'),
express = require('express'),
wsapi = require('../lib/wsapi.js'),
-httputils = require('../lib/httputils.js');
+httputils = require('../lib/httputils.js'),
secrets = require('../lib/secrets.js'),
-db = require('../lib/db.js');
+db = require('../lib/db.js'),
config = require('../lib/configuration.js'),
heartbeat = require('../lib/heartbeat.js'),
metrics = require('../lib/metrics.js'),
@@ -49,7 +49,7 @@ app.use(express.logger({
var statsd_config = config.get('statsd');
if (statsd_config && statsd_config.enabled) {
- logger_statsd = require("connect-logger-statsd");
+ var logger_statsd = require("connect-logger-statsd");
app.use(logger_statsd({
host: statsd_config.hostname || "localhost",
port: statsd_config.port || 8125,
@@ -93,7 +93,7 @@ wsapi.setup({
function doShutdown(readyForShutdownCB) {
require('../lib/bcrypt.js').shutdown();
- db.close(readyForShutdownCB)
+ db.close(readyForShutdownCB);
}
// open the databse
diff --git a/bin/keysigner b/bin/keysigner
index 714a4fed3..1d981b0c5 100755
--- a/bin/keysigner
+++ b/bin/keysigner
@@ -42,7 +42,7 @@ app.use(express.logger({
var statsd_config = config.get('statsd');
if (statsd_config && statsd_config.enabled) {
- logger_statsd = require("connect-logger-statsd");
+ var logger_statsd = require("connect-logger-statsd");
app.use(logger_statsd({
host: statsd_config.hostname || "localhost",
port: statsd_config.port || 8125,
diff --git a/bin/router b/bin/router
index dc409f512..3f7f1330d 100755
--- a/bin/router
+++ b/bin/router
@@ -8,7 +8,7 @@ const
fs = require('fs'),
path = require('path'),
url = require('url'),
-http = require('http');
+http = require('http'),
urlparse = require('urlparse'),
express = require('express');
@@ -70,7 +70,7 @@ app.use(express.limit("10kb"));
var statsd_config = config.get('statsd');
if (statsd_config && statsd_config.enabled) {
- logger_statsd = require("connect-logger-statsd");
+ var logger_statsd = require("connect-logger-statsd");
app.use(logger_statsd({
host: statsd_config.hostname || "localhost",
port: statsd_config.port || 8125,
diff --git a/bin/verifier b/bin/verifier
index d58415422..5596047ee 100755
--- a/bin/verifier
+++ b/bin/verifier
@@ -41,7 +41,7 @@ app.use(express.limit("10kb"));
var statsd_config = config.get('statsd');
if (statsd_config && statsd_config.enabled) {
- logger_statsd = require("connect-logger-statsd");
+ var logger_statsd = require("connect-logger-statsd");
app.use(logger_statsd({
host: statsd_config.hostname || "localhost",
port: statsd_config.port || 8125,
@@ -73,7 +73,7 @@ try {
}
function doVerification(req, resp, next) {
- req.body = req.body || {}
+ req.body = req.body || {};
var assertion = (req.query && req.query.assertion) ? req.query.assertion : req. body.assertion;
var audience = (req.query && req.query.audience) ? req.query.audience : req.body.audience;
@@ -124,7 +124,7 @@ function doVerification(req, resp, next) {
});
}
});
-};
+}
app.post('/verify', doVerification);
app.post('/', doVerification);
--
GitLab