Changeset 17817 for trunk/Nebulous-Server

Timestamp:

May 27, 2008, 1:26:15 PM (18 years ago)

Author:

jhoblitt

Message:

cleanup option handling and docs

File:

• trunk/Nebulous-Server/bin/neb-admin (modified) (6 diffs)

trunk/Nebulous-Server/bin/neb-admin

@@ -3 +3 @@
 # Copyright (C) 2005-2008  Joshua Hoblitt
 #
-# $Id: neb-admin,v 1.2 2008-05-27 21:59:53 jhoblitt Exp $
+# $Id: neb-admin,v 1.3 2008-05-27 23:26:15 jhoblitt Exp $
 
 use strict;
@@ -19 +19 @@
 use Pod::Usage qw( pod2usage );
 
-my ($db, $dbuser, $dbpass, $server, $limit);
+my ($db, $dbuser, $dbpass, $pending, $limit);
 
 $db     = $ENV{'NEB_DB'} unless $db;
 $dbuser = $ENV{'NEB_USER'} unless $dbuser;
 $dbpass = $ENV{'NEB_PASS'} unless $dbpass;
-$server = $ENV{'NEB_SERVER'} unless $server;
 
 GetOptions(
-    'db=s'          => \$db,
-    'user=s'        => \$dbuser,
-    'pass=s'        => \$dbpass,
-    'server|s=s'    => \$server,
-    'limit|l=i'     => \$limit,
+    'db=s'                  => \$db,
+    'user=s'                => \$dbuser,
+    'pass=s'                => \$dbpass,
+    'pendingreplicate|p'    => \$pending,
+    'limit|l=i'             => \$limit,
 ) || pod2usage( 2 );
 
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
-pod2usage( -msg => "Required options: --server", -exitval => 2 )
-    unless $server;
 pod2usage( -msg => "Required options: --db --user --pass", -exitval => 2 )
     unless $db && $dbuser && $dbpass;
+pod2usage( -msg => "--limit is meaningless without --pendingreplicate",
+        -exitval => 2 )
+    if defined $limit and not defined $pending;
+pod2usage( -msg => "no operation specified", -exitval => 2 )
+    unless defined $pending;
 
 # set default limit to 5
 $limit ||= 5;
-
-my $neb = Nebulous::Client->new(
-    proxy => "$server",
-);
-
-die "can't connected to Nebulous Server: $server"
-    unless defined $neb;
 
 my $dbh = DBI->connect(
@@ -157 +152 @@
 =head1 NAME
 
-neb-fsck - check and repair Nebulous volumes
+neb-admin - perform misc. Nebulous administrative functions
 
 =head1 SYNOPSIS
 
-    neb-fsck [--db <database>] [--user <username>] [--pass <password>]
-        [--server <server>]
+    neb-admin [--db <database>] [--user <username>] [--pass <password>]
+        [--pendingreplicate] [--limit <n>]
 
 =head1 DESCRIPTION
@@ -170 +165 @@
 =over 4
 
-=item * --server|-s <URL>
-
-URL of the Nebulous server to connect to.
-
-Optional if the appropriate environment variable is set.
+=item * --pendingreplicate|-p
+
+Print out a list of nebulous keys that need additional replications created.
+
+=item * --limit|-l <n>
+
+Limits the number of items return in response to some request (like
+C<--pendingreplicate>). 
+
+Optional.  Defaults to 5.  --limit 0 is treated as asking for the default
+value.
 
 =item * --db|-d <database>
@@ -203 +204 @@
 
 =over 4
-
-=item * C<NEB_SERVER>
-
-Equivalent to --server|-s
 
 =item * C<NEB_DB>
@@ -256 +253 @@
 =head1 SEE ALSO
 
-L<Nebulous::Server>, L<neb-initdb>, L<neb-df>, L<nebdiskd>
+L<Nebulous::Server>, L<neb-addvol>, L<neb-fsck>, L<neb-initdb>, L<nebdiskd>
 
 =cut