From fc7eac4419df55ba9bb3d661ad277334e384a0e5 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@remote.org>
Date: Tue, 11 May 2010 15:47:45 +0000
Subject: [PATCH] --extended option for tirex-status: show renderer and map
 config only if this is on

---
 BUGS             | 11 +++++++++++
 bin/tirex-status |  9 ++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 BUGS

diff --git a/BUGS b/BUGS
new file mode 100644
index 0000000..6c24041
--- /dev/null
+++ b/BUGS
@@ -0,0 +1,11 @@
+
+Tirex Bugs
+==========
+
+* There are config options metatile_rows and metatile_columns and defaults for
+  those settings in the Perl code as $Tirex::METATILE_ROWS and
+  $Tirex::METATILE_COLUMNS. Some Tirex code looks into the config, some uses the
+  variables above and some has hardcoded dependencies on metatile size.  Nobody
+  has ever tested Tirex with sizes other than 8x8. Especially non-quadratic
+  metatiles will probably not work at all.
+
diff --git a/bin/tirex-status b/bin/tirex-status
index de338d4..d9eb29d 100755
--- a/bin/tirex-status
+++ b/bin/tirex-status
@@ -44,7 +44,7 @@ use Tirex::Status;
 #-----------------------------------------------------------------------------
 
 my %opts = ( raw => 0, once => 0 );
-GetOptions( \%opts, 'help|h', 'once|o', 'raw|r' ) or exit(2);
+GetOptions( \%opts, 'help|h', 'once|o', 'raw|r', 'extended|e' ) or exit(2);
 
 if ($opts{'help'})
 {
@@ -121,8 +121,7 @@ sub format_status
                  . format_queue($d->{'queue'})
                  . format_buckets($d->{'rm'}, $d->{'queue'})
                  . format_rendering($d->{'rm'})
-                 . format_renderers($d->{'renderers'})
-                 . format_maps($d->{'maps'});
+                 . ($opts{'extended'} ?  format_renderers($d->{'renderers'}) . format_maps($d->{'maps'}) : '');
 }
 
 sub format_master_server
@@ -306,6 +305,10 @@ Show status only once, default is to show it once per second.
 Return status in raw JSON format instead of in ANSI coloured human readable
 form. Implies --once.
 
+=item B<-e>, B<--extended>
+
+Show renderer and map config, too.
+
 =back
 
 =head1 DESCRIPTION