Changeset 18231 for trunk/Nebulous-Server/bin/nebdiskd

Timestamp:

Jun 19, 2008, 5:34:28 PM (18 years ago)

Author:

jhoblitt

Message:

add --host option to nebdiskd

File:

• trunk/Nebulous-Server/bin/nebdiskd (modified) (7 diffs)

trunk/Nebulous-Server/bin/nebdiskd

@@ -3 +3 @@
 # Copyright (C) 2007  Joshua Hoblitt
 # 
-# $Id: nebdiskd,v 1.4 2007-05-04 23:36:46 jhoblitt Exp $
+# $Id: nebdiskd,v 1.5 2008-06-20 03:34:28 jhoblitt Exp $
 
 use strict;
@@ -21 +21 @@
 use Pod::Usage qw( pod2usage );
 
-my ($debug, $db, $dbuser, $dbpass, $pidfile, $stop, $restart, $verbose);
+my ($debug, $db, $dbhost, $dbuser, $dbpass, $pidfile, $stop, $restart, $verbose);
 GetOptions(
+    'db|d=s'    => \$db,
     'debug'     => \$debug,
-    'db|d=s'    => \$db,
-    'user|u=s'  => \$dbuser,
+    'host|h=s'  => \$dbhost,
     'pass|p=s'  => \$dbpass,
     'pidfile=s' => \$pidfile,
+    'restart|r' => \$restart,
     'stop|s'    => \$stop,
-    'restart|r' => \$restart,
+    'user|u=s'  => \$dbuser,
     'verbose|v' => \$verbose,
 ) || pod2usage( 2 );
@@ -39 +40 @@
 
 $db     ||= $c->get_db      || $ENV{'NEB_DB'};
+$dbhost ||= $c->get_dbhost  || $ENV{'NEB_DBHOST'} || 'localhost';
 $dbuser ||= $c->get_dbuser  || $ENV{'NEB_USER'};
 $dbpass ||= $c->get_dbpass  || $ENV{'NEB_PASS'};
@@ -51 +53 @@
 
 $c->set_db($db);
+$c->set_dbhost($dbhost);
 $c->set_dbuser($dbuser);
 $c->set_dbpass($dbpass);
@@ -73 +76 @@
 my $dbh = setup_db(
         db      => $db,
+        dbhost  => $dbhost,
         dbuser  => $dbuser,
         dbpass  => $dbpass,
@@ -148 +152 @@
 
     return unless defined $p{db}
+              and defined $p{dbhost}
               and defined $p{dbuser}
               and defined $p{dbpass};
@@ -154 +159 @@
 
     my $dbh = DBI->connect(
-        "DBI:mysql:database=$p{db}:host=localhost",
+        "DBI:mysql:database=$p{db}:host=$p{dbhost}",
         $p{dbuser},
         $p{dbpass},