verdnatura-mirror
/
node-ldapjs
mirror of https://github.com/ldapjs/node-ldapjs.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

We rather replace log4js with bunyan for binaries

This commit is contained in:
Pedro P. Candel 2013-04-24 20:45:19 +02:00
parent 7f33081240
commit 25ffb858ce
5 changed files with 55 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bin/ldapjs-add
View File

@ -9,13 +9,11 @@ var url = require('url');
var nopt = require('nopt');
var ldap = require('../lib/index');
var Logger = require('bunyan');
///--- Globals
var log4js = ldap.log4js;
nopt.typeDefs.DN = {
type: ldap.DN,
validate: function(data, k, val) {
@ -78,7 +76,7 @@ function perror(err) {
///--- Mainline
log4js.setGlobalLogLevel('INFO');
var logLevel = 'info';
var parsed;
try {
@ -112,7 +110,7 @@ if (!parsed.file)
usage(1, 'either -f or stdin must be used for adding objects');
if (parsed.debug)
log4js.setGlobalLogLevel(parsed.debug > 1 ? 'TRACE' : 'DEBUG');
logLevel = (parsed.debug > 1 ? 'trace' : 'debug');
if (!parsed.url)
parsed.url = 'ldap://127.0.0.1:389';
if (!parsed.binddn)
@ -120,9 +118,16 @@ if (!parsed.binddn)
if (!parsed.password)
parsed.password = '';
var log = new Logger({
name: 'ldapjs',
component: 'client',
stream: process.stderr,
level: logLevel
});
var client = ldap.createClient({
url: parsed.url,
log4js: log4js
log: log
});
client.on('error', function(err) {

17
bin/ldapjs-compare
View File

@ -9,13 +9,11 @@ var url = require('url');
var nopt = require('nopt');
var ldap = require('../lib/index');
var Logger = require('bunyan');
///--- Globals
var log4js = ldap.log4js;
nopt.typeDefs.DN = {
type: ldap.DN,
validate: function(data, k, val) {
@ -82,7 +80,7 @@ function perror(err) {
///--- Mainline
log4js.setGlobalLogLevel('INFO');
var logLevel = 'info';
var parsed;
try {
@ -108,7 +106,7 @@ if (!parsed.attribute || typeof(parsed.value) !== 'string')
usage(1, 'attribute and value required');
if (parsed.debug)
log4js.setGlobalLogLevel(parsed.debug > 1 ? 'TRACE' : 'DEBUG');
logLevel = (parsed.debug > 1 ? 'trace' : 'debug');
if (!parsed.url)
parsed.url = 'ldap://127.0.0.1:389';
if (!parsed.binddn)
@ -116,9 +114,16 @@ if (!parsed.binddn)
if (!parsed.password)
parsed.password = '';
var log = new Logger({
name: 'ldapjs',
component: 'client',
stream: process.stderr,
level: logLevel
});
var client = ldap.createClient({
url: parsed.url,
log4js: log4js
log: log
});
client.on('error', function(err) {

17
bin/ldapjs-delete
View File

@ -9,13 +9,11 @@ var url = require('url');
var nopt = require('nopt');
var ldap = require('../lib/index');
var Logger = require('bunyan');
///--- Globals
var log4js = ldap.log4js;
nopt.typeDefs.DN = {
type: ldap.DN,
validate: function(data, k, val) {
@ -76,7 +74,7 @@ function perror(err) {
///--- Mainline
log4js.setGlobalLogLevel('INFO');
var logLevel = 'info';
var parsed;
try {
@ -98,7 +96,7 @@ try {
}
if (parsed.debug)
log4js.setGlobalLogLevel(parsed.debug > 1 ? 'TRACE' : 'DEBUG');
logLevel = (parsed.debug > 1 ? 'trace' : 'debug');
if (!parsed.url)
parsed.url = 'ldap://127.0.0.1:389';
if (!parsed.binddn)
@ -106,9 +104,16 @@ if (!parsed.binddn)
if (!parsed.password)
parsed.password = '';
var log = new Logger({
name: 'ldapjs',
component: 'client',
stream: process.stderr,
level: logLevel
});
var client = ldap.createClient({
url: parsed.url,
log4js: log4js
log: log
});
client.on('error', function(err) {

17
bin/ldapjs-modify
View File

@ -9,13 +9,11 @@ var url = require('url');
var nopt = require('nopt');
var ldap = require('../lib/index');
var Logger = require('bunyan');
///--- Globals
var log4js = ldap.log4js;
nopt.typeDefs.DN = {
type: ldap.DN,
validate: function(data, k, val) {
@ -84,7 +82,7 @@ function perror(err) {
///--- Mainline
log4js.setGlobalLogLevel('INFO');
var logLevel = 'info';
var parsed;
try {
@ -112,7 +110,7 @@ if (!parsed.attribute || !Array.isArray(parsed.value))
usage(1, 'attribute and value required');
if (parsed.debug)
log4js.setGlobalLogLevel(parsed.debug > 1 ? 'TRACE' : 'DEBUG');
logLevel = (parsed.debug > 1 ? 'trace' : 'debug');
if (!parsed.url)
parsed.url = 'ldap://127.0.0.1:389';
if (!parsed.binddn)
@ -120,9 +118,16 @@ if (!parsed.binddn)
if (!parsed.password)
parsed.password = '';
var log = new Logger({
name: 'ldapjs',
component: 'client',
stream: process.stderr,
level: logLevel
});
var client = ldap.createClient({
url: parsed.url,
log4js: log4js
log: log
});
client.on('error', function(err) {

16
bin/ldapjs-search
View File

@ -8,13 +8,11 @@ var url = require('url');
var nopt = require('nopt');
var ldap = require('../lib/index');
var Logger = require('bunyan');
///--- Globals
var log4js = ldap.log4js;
nopt.typeDefs.DN = {
type: ldap.DN,
validate: function(data, k, val) {
@ -114,9 +112,10 @@ try {
usage(1, e.message);
}
var logLevel = 'info';
if (parsed.debug)
log4js.setGlobalLogLevel(parsed.debug > 1 ? 'TRACE' : 'DEBUG');
logLevel = (parsed.debug > 1 ? 'trace' : 'debug');
if (!parsed.url)
parsed.url = 'ldap://127.0.0.1:389';
if (!parsed.binddn)
@ -130,9 +129,16 @@ if (!parsed.control)
if (!parsed.persistent)
parsed.persistent = false;
var log = new Logger({
name: 'ldapjs',
component: 'client',
stream: process.stderr,
level: logLevel
});
var client = ldap.createClient({
url: parsed.url,
log4js: log4js,
log: log,
timeout: parsed.timeout || false
});