[IM] wider use of variable names for code which is fundamentally the …

…same
inex · Nov 22, 2014 · f8f726c · f8f726c
1 parent daf5406
commit f8f726c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/tools/runtime/sflow/control-sflow-detect-ixp-bgp-sessions b/tools/runtime/sflow/control-sflow-detect-ixp-bgp-sessions
@@ -23,21 +23,23 @@
 #
 # Description:
 #
-# startup script for control-sflow-detect-ixp-bgp-sessions
+# startup script for sflow-detect-ixp-bgp-sessions
 
 use warnings;
 use strict;
 use Daemon::Control;
 
+my $progname = 'sflow-detect-ixp-bgp-sessions';
+
 Daemon::Control->new({
-	name		=>	"control-sflow-detect-ixp-bgp-sessions",
+	name		=>	"control-$progname",
 	lsb_start	=>	'$syslog $remote_fs',
 	lsb_stop	=>	'$syslog',
 	lsb_sdesc	=>	'BGP session sflow control daemon',
-	lsb_desc	=>	'Controller for the sflow-detect-ixp-bgp-sessions.',
+	lsb_desc	=>	'Controller for $progname',
 	path		=>	'/usr/local/sbin',
-	program		=>	'sflow-detect-ixp-bgp-sessions',
+	program		=>	$progname,
 	program_args	=>	[],
-	pid_file	=>	'/var/run/sflow-detect-ixp-bgp-sessions.pid',
+	pid_file	=>	'/var/run/$progname.pid',
 	fork		=>	2,
 })->run;
diff --git a/tools/runtime/sflow/control-sflow-to-rrd-handler b/tools/runtime/sflow/control-sflow-to-rrd-handler
@@ -29,15 +29,17 @@ use warnings;
 use strict;
 use Daemon::Control;
 
+my $progname = 'sflow-to-rrd-handler';
+
 Daemon::Control->new({
-	name		=>	"control-sflow-to-rrd-handler",
+	name		=>	"control-$progname",
 	lsb_start	=>	'$syslog $remote_fs',
 	lsb_stop	=>	'$syslog',
-	lsb_sdesc	=>	'Sflow control daemon',
-	lsb_desc	=>	'Controller for the sflow-to-rrd-daemon.',
+	lsb_sdesc	=>	'Sflow to RRD control daemon',
+	lsb_desc	=>	'Controller for $progname',
 	path		=>	'/usr/local/sbin',
-	program		=>	'sflow-to-rrd-handler',
+	program		=>	$progname,
 	program_args	=>	[],
-	pid_file	=>	'/var/run/sflow-to-rrd-handler.pid',
+	pid_file	=>	'/var/run/$progname.pid',
 	fork		=>	2,
 })->run;