Changeset 782

Show
Ignore:
Timestamp:
07/27/08 22:11:16 (20 months ago)
Author:
kane
Message:

r6513@coke: josboum | 2008-07-27 18:55:46 +0200

  • make the help list more dynamic, so new commands aren't being left out of the help message
  • also add required arguments and availability to the help message
Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/DJabberd/lib/DJabberd/Connection/Admin.pm

    r683 r782  
    66 
    77use fields qw(buffer server handle); 
    8 use vars qw($initial_memory); 
     8use vars qw($initial_memory @Help); 
    99 
    1010use Devel::Peek (); 
     
    6868} 
    6969 
     70push @Help, 'close | exit | quit'; 
    7071sub CMD_close { $_[0]->close } 
    7172sub CMD_quit { $_[0]->close } 
    7273sub CMD_exit { $_[0]->close } 
    7374 
     75push @Help, 'conns | connections'; 
    7476*CMD_conns = \&CMD_connections; 
    7577sub CMD_connections { 
     
    8991} 
    9092 
     93push @Help, 'latency_log'; 
    9194sub CMD_latency_log { 
    9295   my $self = shift; 
     
    98101} 
    99102 
     103push @Help, 'latency'; 
    100104sub CMD_latency { 
    101105    my $self = shift; 
     
    124128} 
    125129 
     130push @Help, 'help'; 
    126131sub CMD_help { 
    127132    my $self = shift; 
    128     $self->write($_) foreach split(/\n/, <<EOC); 
    129 Available commands: 
    130    version 
    131    help 
    132    list vhosts 
    133    quit 
    134    connections 
    135    conns 
    136    conns servers 
    137    conns clients 
    138    latency 
    139    users 
    140 . 
    141 EOC 
    142 } 
    143  
     133    $self->write($_) for 'Available commands:', (sort @Help), '.'; 
     134} 
     135 
     136push @Help, 'list vhosts'; 
    144137sub CMD_list { 
    145138    my $self = shift; 
     
    155148} 
    156149 
     150push @Help, 'stats'; 
    157151sub CMD_stats { 
    158152    my $self = shift; 
     
    180174} 
    181175 
     176push @Help, 'counters'; 
    182177sub CMD_counters { 
    183178    my $self = shift; 
     
    189184} 
    190185 
     186push @Help, 'users'; 
    191187sub CMD_users { 
    192188    my $self = shift; 
     
    202198} 
    203199 
     200push @Help, 'version'; 
    204201sub CMD_version { 
    205202    $_[0]->write($DJabberd::VERSION); 
     
    255252} 
    256253 
     254push @Help, 'gladiator [lite | delta | all] ' . ( $has_gladiator ? '' : '(unavailable)' ); 
    257255my %last_gladiator; 
    258256sub CMD_gladiator { 
     
    287285} 
    288286 
     287push @Help, 'cycle ' . ( $has_gladiator ? '' : '(unavailable)' ); 
    289288sub CMD_cycle { 
    290289    my $self = shift; 
     
    309308} 
    310309 
     310push @Help, 'fields package_name'; 
    311311sub CMD_fields { 
    312312    my ($self, $arg) = @_; 
     
    318318} 
    319319 
     320push @Help, 'note_arena ' . ( $has_devel_leak ? '' : '(unavailable)' ); 
    320321sub CMD_note_arena { 
    321322    my ($self, $arg) = @_; 
     
    326327} 
    327328 
     329push @Help, 'check_arena ' . ( $has_devel_leak ? '' : '(unavailable)' ); 
    328330sub CMD_check_arena { 
    329331    my ($self, $arg) = @_; 
     
    333335} 
    334336 
     337push @Help, 'reload'; 
    335338sub CMD_reload { 
    336339    my $self = shift; 
     
    344347} 
    345348 
     349push @Help, 'send_stanza JID STANZA'; 
    346350sub CMD_send_stanza { 
    347351    my ($self, $params) = @_;