Changeset 18349

Timestamp:

Jun 27, 2008, 1:29:42 PM (18 years ago)

Author:

jhoblitt

Message:

add --host option to neb-admin

Location:

trunk/Nebulous-Server

Files:

• Changes (modified) (1 diff)
• bin/neb-admin (modified) (9 diffs)

trunk/Nebulous-Server/Changes

@@ -2 +2 @@
 
 0.13
+    - add --host option to neb-admin
     - add --host option to nebdiskd
     - decalare default SQL character set

trunk/Nebulous-Server/bin/neb-admin

@@ -3 +3 @@
 # Copyright (C) 2005-2008  Joshua Hoblitt
 #
-# $Id: neb-admin,v 1.3 2008-05-27 23:26:15 jhoblitt Exp $
+# $Id: neb-admin,v 1.4 2008-06-27 23:29:42 jhoblitt Exp $
 
 use strict;
@@ -9 +9 @@
 
 use vars qw( $VERSION );
-$VERSION = '0.01';
+$VERSION = '0.02';
 
 use DBI;
@@ -19 +19 @@
 use Pod::Usage qw( pod2usage );
 
-my ($db, $dbuser, $dbpass, $pending, $limit);
-
-$db     = $ENV{'NEB_DB'} unless $db;
-$dbuser = $ENV{'NEB_USER'} unless $dbuser;
-$dbpass = $ENV{'NEB_PASS'} unless $dbpass;
+my ($db, $dbhost, $dbuser, $dbpass, $pending, $limit);
+
+$db     = $ENV{'NEB_DB'};
+$dbhost = $ENV{'NEB_DBHOST'} || 'localhost';
+$dbuser = $ENV{'NEB_USER'};
+$dbpass = $ENV{'NEB_PASS'};
 
 GetOptions(
-    'db=s'                  => \$db,
-    'user=s'                => \$dbuser,
-    'pass=s'                => \$dbpass,
-    'pendingreplicate|p'    => \$pending,
+    'db|d=s'                => \$db,
+    'host=s'                => \$dbhost,
+    'user|u=s'              => \$dbuser,
+    'pass|p=s'              => \$dbpass,
+    'pendingreplicate|r'    => \$pending,
     'limit|l=i'             => \$limit,
 ) || pod2usage( 2 );
@@ -46 +48 @@
 
 my $dbh = DBI->connect(
-    "DBI:mysql:database=$db:host=localhost",
+    "DBI:mysql:database=$db:host=$dbhost",
     $dbuser,
     $dbpass,
@@ -69 +71 @@
 $query->finish;
     
+exit unless scalar @rows;
+
 print "replciate MULTI\n\n";
 
@@ -156 +160 @@
 =head1 SYNOPSIS
 
-    neb-admin [--db <database>] [--user <username>] [--pass <password>]
-        [--pendingreplicate] [--limit <n>]
+    neb-admin [--host <db host>] [--db <db name>] [--user <db username>]
+        [--pass <db password>] [--pendingreplicate] [--limit <n>]
 
 =head1 DESCRIPTION
@@ -165 +169 @@
 =over 4
 
-=item * --pendingreplicate|-p
+=item * --pendingreplicate|-r
 
 Print out a list of nebulous keys that need additional replications created.
@@ -176 +180 @@
 Optional.  Defaults to 5.  --limit 0 is treated as asking for the default
 value.
+
+=item * --host <database host>
+
+Name of host on which the database resides.
+
+Optional.  Defaults to C<localhost>.
 
 =item * --db|-d <database>
@@ -208 +218 @@
 
 Equivalent to --db|-d
+
+=item * C<NEB_HOST>
+
+Equivalent to --host
 
 =item * C<NEB_USER>