[Orca-checkins] r274 - in trunk/orca: . data_gatherers/orca_services data_gatherers/orcallator data_gatherers/procallator lib/Orca orca
Blair Zajac
blair at orcaware.com
Sun Jan 18 16:21:58 PST 2004
Author: blair
Date: Sun Jan 18 16:21:10 2004
New Revision: 274
Modified:
trunk/orca/CHANGES
trunk/orca/FAQ
trunk/orca/autogen.sh
trunk/orca/data_gatherers/orca_services/orca_services.cfg.in
trunk/orca/data_gatherers/orca_services/orca_services.pl.in
trunk/orca/data_gatherers/orca_services/orca_services_running.pl.in
trunk/orca/data_gatherers/orca_services/start_orca_services.sh.in
trunk/orca/data_gatherers/orcallator/orcallator.cfg.in
trunk/orca/data_gatherers/orcallator/orcallator_column.pl
trunk/orca/data_gatherers/orcallator/orcallator_running.pl.in
trunk/orca/data_gatherers/orcallator/start_orcallator.sh.in
trunk/orca/data_gatherers/procallator/procallator.cfg.in
trunk/orca/data_gatherers/procallator/procallator.pl.in
trunk/orca/lib/Orca/Config.pm
trunk/orca/lib/Orca/Constants.pm
trunk/orca/lib/Orca/HTMLFile.pm
trunk/orca/lib/Orca/ImageFile.pm
trunk/orca/lib/Orca/NewState.pm
trunk/orca/lib/Orca/OldState.pm
trunk/orca/lib/Orca/OpenFileHash.pm
trunk/orca/lib/Orca/RRDFile.pm
trunk/orca/lib/Orca/SourceFile.pm
trunk/orca/lib/Orca/SourceFileIDs.pm
trunk/orca/lib/Orca/Utils.pm
trunk/orca/orca/orca.pl.in
Log:
* Everywhere:
Use ' instead of ` to begin quoting.
Modified: trunk/orca/CHANGES
==============================================================================
--- trunk/orca/CHANGES (original)
+++ trunk/orca/CHANGES Sun Jan 18 16:21:10 2004
@@ -127,11 +127,11 @@
Sat Aug 24 20:39:35 PDT 2002 <blair at orcaware.com> Blair Zajac
- * src/orca.pl.in: At the top of the `Available Targets' and
- `Available Data Sets' HTML pages, add a link back to the top
+ * src/orca.pl.in: At the top of the 'Available Targets' and
+ 'Available Data Sets' HTML pages, add a link back to the top
so that the user does not have to use the browser's back
- button. Add `<br /><br />' after any plots so that on the
- `All' plots, there is some vertical separation between the
+ button. Add '<br /><br />' after any plots so that on the
+ 'All' plots, there is some vertical separation between the
plots when viewed by the Opera browser.
Thu Aug 22 21:24:43 PDT 2002 <blair at orcaware.com> Blair Zajac
@@ -186,11 +186,11 @@
Wed Aug 7 19:57:45 PDT 2002 <blair at orcaware.com> Blair Zajac
- * Makefile.in: Restructure the `all' and `install' rules so
+ * Makefile.in: Restructure the 'all' and 'install' rules so
that if make fails in one subdirectory, then the top level
make fail fail immediately. Previously, all subdirectories
would be built, regardless if there was a failure in any one
- subdirectory. Do not do this for `clean' and `distclean',
+ subdirectory. Do not do this for 'clean' and 'distclean',
because they should always clean up as much as they can,
regardless of any sub-make failures.
* configure.in: Rename all borp_* variables to orca_*. Fix a
@@ -397,7 +397,7 @@
Thu Nov 8 10:49:58 PST 2001 <blair at orcaware.com> Blair Zajac
* FAQ: Add an answer to describe the message: "Warning: file
- `.../orcallator/host1/orcallator-2001-11-06-000' did exist
+ '.../orcallator/host1/orcallator-2001-11-06-000' did exist
and is now gone."
Sat Nov 3 08:04:26 PST 2001 <blair at orcaware.com> Blair Zajac
@@ -624,10 +624,10 @@
if WATCH_MUTEX defined.
* orcallator/orcallator.se: Upgrade to orcallator.se 1.28b5.
Add three parameters that vmstat outputs, #runque, vmstat's
- `r' column, which is the number of processes in the run
- queue waiting to run on a CPU, #waiting, vmstat's `b'
+ 'r' column, which is the number of processes in the run
+ queue waiting to run on a CPU, #waiting, vmstat's 'b'
column, which is the number of processes blocked for
- resourceses (I/O, paging), and #swpque, vmstat's `w', the
+ resourceses (I/O, paging), and #swpque, vmstat's 'w', the
number of proceses runnable but swapped out. Increase
MAX_COLUMNS from 512 to 2048. Check [wr]lentime to see if
an EMC is using a fake disk for control. EMC disks have a
@@ -955,7 +955,7 @@
Wed Feb 7 16:43:26 PST 2001
* The previous fix for the
- `Use on uninitialized value in array element at (eval X)
+ 'Use on uninitialized value in array element at (eval X)
line 1, <DATA> line Y'
warning did not work on Perl 5.004_05. Modify the fix so
that it will work on this older version of Perl.
@@ -981,7 +981,7 @@
Mon Feb 5 11:59:48 PST 2001
* src/orca.pl.in: Fix the warning message in src/orca.pl.in
- `Use on uninitialized value in array element at (eval X)
+ 'Use on uninitialized value in array element at (eval X)
line 1, <DATA> line Y'
when Orca was run with Perl 5.6.0. The problem was that the
filename_compare subroutine was eval'ed in Orca::Config
@@ -1094,7 +1094,7 @@
option named date_parse, which is an arbitrary Perl
subroutine that is given two arguments, the first being the
name of the file where the data is loaded and the second the
- string from the `date_source' column that contains some time
+ string from the 'date_source' column that contains some time
information. The subroutine should return the Unix epoch
time. If this option is not specified, then Orca assumes
that the string holds the Unix epoch time.
@@ -1906,7 +1906,7 @@
current directory.
* Perl_glob will only return found files and no other type.
- It will also not follow any directories named `..'.
+ It will also not follow any directories named '..'.
* Include RRDtool 0.99.29.1 with Orca. This includes a
Makefile patch and does not include a new version of RRDs.pm
@@ -1925,7 +1925,7 @@
eval.
* Do not prepend base_dir to any paths if they begin with
- either `/' or `./'.
+ either '/' or './'.
* Require and include RRDtool 0.99.29 with Orca.
Modified: trunk/orca/FAQ
==============================================================================
--- trunk/orca/FAQ (original)
+++ trunk/orca/FAQ Sun Jan 18 16:21:10 2004
@@ -29,12 +29,12 @@
2.1) Number of columns in line '1,2,3.....' of
../orcallator/.../percol-2000-09-26 does not match column
description.
- 2.2) Warning: file `../orcallator/.../temp-percol-2001-02-22' was
+ 2.2) Warning: file '../orcallator/.../temp-percol-2001-02-22' was
current and now is not.
2.3) Warning: cannot create Orca::HTMLFile object: cannot open
- `/home/orca_html/o_host1-monthly.html.htm' for writing: Too
+ '/home/orca_html/o_host1-monthly.html.htm' for writing: Too
many open files.
- 2.4) Warning: file `.../orcallator/host1/orcallator-2001-11-06-000'
+ 2.4) Warning: file '.../orcallator/host1/orcallator-2001-11-06-000'
did exist and is now gone.
Solaris/Orcallator.se
@@ -205,7 +205,7 @@
When Orca sees a line in an input data file that does not have
the same number of columns as defined at the top of the file
- when column_description is `first_line' or does not match the
+ when column_description is 'first_line' or does not match the
column_description, then Orca will complain and ignore the
line. Additionally, Orca will not record the data from this
line in the RRD files and no data will be plotted.
@@ -224,18 +224,18 @@
columns or a name of a column changes so that Orca will not
complain and all of your data will be plotted.
- 2.2) Warning: file `../orcallator/.../temp-percol-2001-02-22' was
+ 2.2) Warning: file '../orcallator/.../temp-percol-2001-02-22' was
current and now is not.
First, Orca considers a file to be current if the file's last
- modified time is within `late_interval' seconds of the current
+ modified time is within 'late_interval' seconds of the current
time. In other words, Orca checks if a process is modifying
- the file to keep it current. The `late_interval' value is
- determined by the configuration file or set to the `interval'
- value if the configuration file does not set `late_interval'.
+ the file to keep it current. The 'late_interval' value is
+ determined by the configuration file or set to the 'interval'
+ value if the configuration file does not set 'late_interval'.
Orca stat()s the file when it first looks for files using the
- `find_files' and determines that the file is current. Any time
+ 'find_files' and determines that the file is current. Any time
after that Orca reads the file, it stat()s the file again and
determines if it is current. If there was a previous stat()
and the file was current followed by another stat() and the
@@ -261,7 +261,7 @@
Increasing the "late_interval" may also remove this error.
2.3) Warning: cannot create Orca::HTMLFile object: cannot open
- `/home/orca_html/o_host1-monthly.html.htm' for writing: Too
+ '/home/orca_html/o_host1-monthly.html.htm' for writing: Too
many open files.
This obviously happens with Orca runs out of open file
@@ -307,7 +307,7 @@
to Orca 0.26. This should have Orca reduce its file descriptor
count.
- 2.4) Warning: file `.../orcallator/host1/orcallator-2001-11-06-000'
+ 2.4) Warning: file '.../orcallator/host1/orcallator-2001-11-06-000'
did exist and is now gone.
Orca prints this message when it found an input data file to
@@ -620,7 +620,7 @@
columns either specified in the orcallator.cfg with the
column_description listing the actual column names or the
column names as specified in the first line of the input data
- file when column_description is set to `first_line'. If the
+ file when column_description is set to 'first_line'. If the
number of columns do not match, then Orca ignores this data to
protect the RRD files from incorrect data added to them.
Modified: trunk/orca/autogen.sh
==============================================================================
--- trunk/orca/autogen.sh (original)
+++ trunk/orca/autogen.sh Sun Jan 18 16:21:10 2004
@@ -22,7 +22,7 @@
# The Orca Subversion repository contains RRDtool, which has its own
# automake, autoconf and libtool setup. When checking out Orca from
# Subversion, it does not preserve the relative timestamps of the
-# build environment, which can cause `make' to rebuild RRDtool's build
+# build environment, which can cause 'make' to rebuild RRDtool's build
# environment.
#
# To work around this, touch the build files in chronological order.
Modified: trunk/orca/data_gatherers/orca_services/orca_services.cfg.in
==============================================================================
--- trunk/orca/data_gatherers/orca_services/orca_services.cfg.in (original)
+++ trunk/orca/data_gatherers/orca_services/orca_services.cfg.in Sun Jan 18 16:21:10 2004
@@ -34,7 +34,7 @@
# This defines the email address of people to warn when a file that is
# being updated constantly stops being updated. For mathematical
-# expressions use the word `interval' to get the interval number for
+# expressions use the word 'interval' to get the interval number for
# the data source.
warn_email root at localhost
late_interval interval + 30
Modified: trunk/orca/data_gatherers/orca_services/orca_services.pl.in
==============================================================================
--- trunk/orca/data_gatherers/orca_services/orca_services.pl.in (original)
+++ trunk/orca/data_gatherers/orca_services/orca_services.pl.in Sun Jan 18 16:21:10 2004
@@ -248,8 +248,8 @@
print P "$$\n";
close P;
} else {
- &logit("can't save pid (can't write to \`$PidFile')");
- warn "$progname: can't save pid (can't write to \`$PidFile')\n";
+ &logit("can't save pid (can't write to '$PidFile')");
+ warn "$progname: can't save pid (can't write to '$PidFile')\n";
}
Modified: trunk/orca/data_gatherers/orca_services/orca_services_running.pl.in
==============================================================================
--- trunk/orca/data_gatherers/orca_services/orca_services_running.pl.in (original)
+++ trunk/orca/data_gatherers/orca_services/orca_services_running.pl.in Sun Jan 18 16:21:10 2004
@@ -12,9 +12,9 @@
foreach my $stats_dir (@stats_dirs) {
- die "$0: unable to change to `$stats_dir'" unless chdir $stats_dir;
+ die "$0: unable to change to '$stats_dir'" unless chdir $stats_dir;
- die "$0: unable to open `.' for reading: $!\n" unless opendir(DIR, '.');
+ die "$0: unable to open '.' for reading: $!\n" unless opendir(DIR, '.');
my @hosts = sort grep { $_ !~ /^\./ } readdir(DIR);
Modified: trunk/orca/data_gatherers/orca_services/start_orca_services.sh.in
==============================================================================
--- trunk/orca/data_gatherers/orca_services/start_orca_services.sh.in (original)
+++ trunk/orca/data_gatherers/orca_services/start_orca_services.sh.in Sun Jan 18 16:21:10 2004
@@ -32,7 +32,7 @@
variable_is_set_or_exit UNAME
# Get the hostname without the fully qualified part; that is, trim off
-# anything past the first `.'.
+# anything past the first '.'.
uname=`$UNAME -n | $CUT -d. -f1`
# The directory these files go into is $RAW_ORCA_SERVICES_DIR/HOSTNAME.
Modified: trunk/orca/data_gatherers/orcallator/orcallator.cfg.in
==============================================================================
--- trunk/orca/data_gatherers/orcallator/orcallator.cfg.in (original)
+++ trunk/orca/data_gatherers/orcallator/orcallator.cfg.in Sun Jan 18 16:21:10 2004
@@ -36,7 +36,7 @@
# This defines the email address of people to warn when a file that is
# being updated constantly stops being updated. For mathematical
-# expressions use the word `interval' to get the interval number for
+# expressions use the word 'interval' to get the interval number for
# the data source.
warn_email @WARN_EMAIL@
late_interval interval + 30
Modified: trunk/orca/data_gatherers/orcallator/orcallator_column.pl
==============================================================================
--- trunk/orca/data_gatherers/orcallator/orcallator_column.pl (original)
+++ trunk/orca/data_gatherers/orcallator/orcallator_column.pl Sun Jan 18 16:21:10 2004
@@ -71,7 +71,7 @@
for (my $a=0; $a<@ARGV; ++$a) {
my $file = $ARGV[$a];
open(FILE, $file) or
- die "$0: unable to open `$file' for reading: $!\n";
+ die "$0: unable to open '$file' for reading: $!\n";
# Read the file and on each line look for redefinitions of the
# column names.
Modified: trunk/orca/data_gatherers/orcallator/orcallator_running.pl.in
==============================================================================
--- trunk/orca/data_gatherers/orcallator/orcallator_running.pl.in (original)
+++ trunk/orca/data_gatherers/orcallator/orcallator_running.pl.in Sun Jan 18 16:21:10 2004
@@ -16,14 +16,14 @@
$stats_dir =~ s#/+$##g;
unless (opendir(DIR, $stats_dir)) {
- warn "$0: cannot opendir `$stats_dir': $!\n";
+ warn "$0: cannot opendir '$stats_dir': $!\n";
next;
}
my @hosts = sort grep { $_ !~ /^\./ } readdir(DIR);
closedir(DIR)
- or warn "$0: error in closedir `$stats_dir': $!\n";
+ or warn "$0: error in closedir '$stats_dir': $!\n";
print "Now checking $stats_dir\n";
@@ -39,7 +39,7 @@
next unless -d $host_dir;
unless (opendir(DIR, $host_dir)) {
- warn "$0: cannot opendir `$host_dir': $!\n";
+ warn "$0: cannot opendir '$host_dir': $!\n";
next;
}
@@ -48,7 +48,7 @@
$_ =~ $orcallator_re } readdir(DIR);
closedir(DIR)
- or warn "$0: error in closedir `$host_dir': $!\n";
+ or warn "$0: error in closedir '$host_dir': $!\n";
# Of the files with today's date in it, determine which one was
# last modified.
@@ -57,7 +57,7 @@
my $file = "$host_dir/$f";
my @stat = stat($file);
unless (@stat) {
- warn "$0: cannot stat `$file': $!\n";
+ warn "$0: cannot stat '$file': $!\n";
next;
}
$files{"$host/$f"} = $stat[9];
@@ -65,7 +65,7 @@
@files = keys %files;
unless (@files) {
- warn "For host `$host', there is no $orcallator_base* or ",
+ warn "For host '$host', there is no $orcallator_base* or ",
"$percol_base*.\n";
next;
}
Modified: trunk/orca/data_gatherers/orcallator/start_orcallator.sh.in
==============================================================================
--- trunk/orca/data_gatherers/orcallator/start_orcallator.sh.in (original)
+++ trunk/orca/data_gatherers/orcallator/start_orcallator.sh.in Sun Jan 18 16:21:10 2004
@@ -91,7 +91,7 @@
esac
# Get the hostname without the fully qualified part; that is, trim off
-# anything past the first `.'.
+# anything past the first '.'.
uname=`$UNAME -n | $CUT -d. -f1`
# Make sure the hostname can be found.
Modified: trunk/orca/data_gatherers/procallator/procallator.cfg.in
==============================================================================
--- trunk/orca/data_gatherers/procallator/procallator.cfg.in (original)
+++ trunk/orca/data_gatherers/procallator/procallator.cfg.in Sun Jan 18 16:21:10 2004
@@ -36,7 +36,7 @@
# This defines the email address of people to warn when a file that is
# being updated constantly stops being updated. For mathematical
-# expressions use the word `interval' to get the interval number for
+# expressions use the word 'interval' to get the interval number for
# the data source.
warn_email @WARN_EMAIL@
late_interval interval + 30
Modified: trunk/orca/data_gatherers/procallator/procallator.pl.in
==============================================================================
--- trunk/orca/data_gatherers/procallator/procallator.pl.in (original)
+++ trunk/orca/data_gatherers/procallator/procallator.pl.in Sun Jan 18 16:21:10 2004
@@ -33,7 +33,7 @@
# Create output directory if needed.
unless (-d $DEST_DIR) {
unless (mkdir($DEST_DIR, 0755)) {
- die "$0: cannot create destiniation directory `$DEST_DIR': $!\n";
+ die "$0: cannot create destiniation directory '$DEST_DIR': $!\n";
}
}
Modified: trunk/orca/lib/Orca/Config.pm
==============================================================================
--- trunk/orca/lib/Orca/Config.pm (original)
+++ trunk/orca/lib/Orca/Config.pm Sun Jan 18 16:21:10 2004
@@ -251,8 +251,8 @@
}
if ($@) {
- warn "$0: cannot evalulate `$option' in $where in ",
- "`$config_filename':\n $expr\nOutput: $@\n";
+ warn "$0: cannot evalulate '$option' in $where in ",
+ "'$config_filename':\n $expr\nOutput: $@\n";
return;
} else {
return $sub;
@@ -279,8 +279,8 @@
local $SIG{__WARN__} = \&die_when_called;
eval '&$sub(3.1415926) + 0;';
if ($@) {
- warn "$0: cannot execute `late_interval' in $where in ",
- "`$config_filename':\n $expr\nOutput: $@\n";
+ warn "$0: cannot execute 'late_interval' in $where in ",
+ "'$config_filename':\n $expr\nOutput: $@\n";
return;
} else {
return $sub;
@@ -317,22 +317,22 @@
if (@require == 2) {
my ($require_what, $require_version) = @require;
unless ($require_what eq 'Orca') {
- warn "$0: error: `require' only accepts `Orca' as first argument in ",
- "`$config_filename'.\n";
+ warn "$0: error: 'require' only accepts 'Orca' as first argument in ",
+ "'$config_filename'.\n";
++$number_errors;
}
if ($require_version !~ /^\d+(?:\.\d*)?$/ and
$require_version !~ /^\.\d+$/) {
++$number_errors;
- warn "$0: error: `require' second argument `$require_version' is not ",
- "a number in `$config_filename'.\n";
+ warn "$0: error: 'require' second argument '$require_version' is not ",
+ "a number in '$config_filename'.\n";
} elsif ($ORCA_VERSION < $require_version) {
++$number_errors;
warn "$0: Orca version $ORCA_VERSION less than required version ",
- "$require_version specified in `$config_filename'.\n";
+ "$require_version specified in '$config_filename'.\n";
}
} else {
- warn "$0: error: `require' needs two arguments in `$config_filename'.\n";
+ warn "$0: error: 'require' needs two arguments in '$config_filename'.\n";
++$number_errors;
}
}
@@ -343,7 +343,7 @@
if (defined $config_global{base_dir}) {
$config_global{rrd_dir} = $config_global{base_dir};
} else {
- warn "$0: error: must set `rrd_dir' in `$config_filename'.\n";
+ warn "$0: error: must set 'rrd_dir' in '$config_filename'.\n";
++$number_errors;
}
}
@@ -352,7 +352,7 @@
my $required_error = 0;
foreach my $option (@cc_required_global) {
unless (defined $config_global{$option}) {
- warn "$0: error: must set `$option' in `$config_filename'.\n";
+ warn "$0: error: must set '$option' in '$config_filename'.\n";
$required_error = 1;
++$number_errors;
}
@@ -361,7 +361,7 @@
# Quit now if there were any required options that were not set
# since use of then will cause uninitialized warnings.
if ($required_error) {
- die "$0: loading configuration file `$config_filename' got ",
+ die "$0: loading configuration file '$config_filename' got ",
"$number_errors error(s).\n";
}
@@ -369,7 +369,7 @@
foreach my $dir_key ('html_dir', 'rrd_dir') {
my $dir = $config_global{$dir_key};
unless (-d $dir) {
- warn "$0: error: please create $dir_key `$dir'.\n";
+ warn "$0: error: please create $dir_key '$dir'.\n";
++$number_errors;
}
}
@@ -391,7 +391,7 @@
my $mfl = $config_global{max_filename_length};
if (defined $mfl) {
unless ($mfl =~ /^\d+$/ and $mfl > 63) {
- warn "$0: error: max_filename_length `$mfl' is not a number > 63.\n";
+ warn "$0: error: max_filename_length '$mfl' is not a number > 63.\n";
++$number_errors;
}
} else {
@@ -421,20 +421,20 @@
# and minutes will only be positive, so check for hours > 23 and
# minutes > 59.
unless ($hours < 24) {
- warn "$0: warning: ignoring find_times `$find_time': hours must be ",
+ warn "$0: warning: ignoring find_times '$find_time': hours must be ",
"less than 24.\n";
++$number_errors;
next;
}
unless ($minutes < 60) {
- warn "$0: warning: ignoring find_times `$find_time': minutes must be ",
+ warn "$0: warning: ignoring find_times '$find_time': minutes must be ",
"less than 60.\n";
++$number_errors;
next;
}
push(@find_times, $hours + $minutes/60.0);
} else {
- warn "$0: warning: ignoring find_times `$find_time': illegal format.\n";
+ warn "$0: warning: ignoring find_times '$find_time': illegal format.\n";
++$number_errors;
}
}
@@ -466,14 +466,14 @@
# There must be at least one timespan plot.
unless (@IMAGE_PLOT_TYPES) {
warn "$0: error: generate_*_plots parameters turn off all plots in ",
- "`$config_filename'.\n";
+ "'$config_filename'.\n";
++$number_errors;
}
# There must be at least one group.
unless (@config_groups) {
- warn "$0: error: must define at least one `group' in ",
- "`$config_filename'.\n";
+ warn "$0: error: must define at least one 'group' in ",
+ "'$config_filename'.\n";
++$number_errors;
}
@@ -485,8 +485,8 @@
$required_error = 0;
foreach my $option (@cc_required_group) {
unless (defined $group->{$option}) {
- warn "$0: error: must set `$option' for `group $group_name' ",
- "in `$config_filename'.\n";
+ warn "$0: error: must set '$option' for 'group $group_name' ",
+ "in '$config_filename'.\n";
$required_error = 1;
++$number_errors;
}
@@ -495,7 +495,7 @@
# Quit now if there were any required options that were not set
# since use of then will cause uninitialized warnings.
if ($required_error) {
- die "$0: loading configuration file `$config_filename' got ",
+ die "$0: loading configuration file '$config_filename' got ",
"$number_errors error(s).\n";
}
@@ -513,8 +513,8 @@
# Check that the interval is a number.
unless ($group->{interval} =~ /^\d+$/ and $group->{interval} > 0) {
- warn "$0: error: interval `$group->{interval}' for `group $group_name' ",
- "is not an integer greater than 0 in `$config_filename'.\n";
+ warn "$0: error: interval '$group->{interval}' for 'group $group_name' ",
+ "is not an integer greater than 0 in '$config_filename'.\n";
++$number_errors;
}
@@ -522,7 +522,7 @@
# global one.
my $expr;
if ($expr = $group->{late_interval}) {
- $sub = compile_late_interval("`group $group_name'",
+ $sub = compile_late_interval("'group $group_name'",
$config_filename,
$expr);
if ($sub) {
@@ -541,12 +541,12 @@
my $value;
eval '$value = &$sub($group->{interval});';
if ($@) {
- warn "$0: cannot execute `late_interval' in `group $group_name' in ",
- "`$config_filename':\n $expr\nOutput: $@\n";
+ warn "$0: cannot execute 'late_interval' in 'group $group_name' in ",
+ "'$config_filename':\n $expr\nOutput: $@\n";
++$number_errors;
} elsif ($value !~ /^\d+$/ and $value <= 0) {
- warn "$0: `late_interval' in `group $group_name' did not generate an ",
- "integer `$value' greater than 0.\n";
+ warn "$0: 'late_interval' in 'group $group_name' did not generate an ",
+ "integer '$value' greater than 0.\n";
++$number_errors;
}
$group->{late_interval} = $value;
@@ -557,8 +557,8 @@
# generate the RRDs. The second interval is the interval before
# the file is considered late and is larger than the data update
# interval. This interval is calculated by using the mathematical
- # expression given in the `late_interval' configuration option.
- # If `late_interval' is not defined, then it gets defaulted to the
+ # expression given in the 'late_interval' configuration option.
+ # If 'late_interval' is not defined, then it gets defaulted to the
# data update interval. The last interval is the interval to use
# to tell the program when to attempt to read the file next.
# Because it can take some time for the source files to be
@@ -578,7 +578,7 @@
$group->{filename_compare} :
'sub { $a cmp $b }';
if (compile_sub('filename_compare',
- "`group $group_name'",
+ "'group $group_name'",
$config_filename,
$expr)) {
# This subroutine looks fine. Now change all the variables to
@@ -586,7 +586,7 @@
$expr =~ s/\$a(\W)/\$sfile_fids[\$a]$1/g;
$expr =~ s/\$b(\W)/\$sfile_fids[\$b]$1/g;
$sub = compile_sub('filename_compare',
- "group `$group_name'",
+ "group '$group_name'",
$config_filename,
$expr);
if ($sub) {
@@ -610,12 +610,12 @@
$group->{date_parse} = 0;
if ($date_source eq 'column_name') {
if (@{$group->{date_source}} != 2) {
- warn "$0: error: incorrect number of arguments for `date_source' for ",
- "`group $group_name'.\n";
+ warn "$0: error: incorrect number of arguments for 'date_source' for ",
+ "'group $group_name'.\n";
++$number_errors;
} elsif (my $expr = $group->{date_parse}) {
unless ($group->{date_parse} = compile_sub('date_parse',
- "group `$group_name'",
+ "group '$group_name'",
$config_filename,
$expr)) {
++$number_errors;
@@ -623,8 +623,8 @@
}
} else {
unless ($date_source eq 'file_mtime') {
- warn "$0: error: illegal argument for `date_source' for ",
- "`group $group_name'.\n";
+ warn "$0: error: illegal argument for 'date_source' for ",
+ "'group $group_name'.\n";
++$number_errors;
}
}
@@ -659,9 +659,9 @@
local $SIG{__WARN__} = \&die_when_called;
eval { $test_string =~ /$find/ };
if ($@) {
- warn "$0: error: illegal regular expression in `find_files ",
- "$orig_find' for `files $group_name' in ",
- "`$config_filename':\n$@\n";
+ warn "$0: error: illegal regular expression in 'find_files ",
+ "$orig_find' for 'files $group_name' in ",
+ "'$config_filename':\n$@\n";
++$number_errors;
} else {
$find_files{$find} = 1;
@@ -672,7 +672,7 @@
# There must be at least one plot.
unless (@config_plots) {
- warn "$0: error: must define at least one `plot' in `$config_filename'.\n";
+ warn "$0: error: must define at least one 'plot' in '$config_filename'.\n";
++$number_errors;
}
@@ -686,8 +686,8 @@
foreach my $option (@cc_required_plot) {
unless (defined $plot->{$option}) {
$required_error = 1;
- warn "$0: error: must set `$option' for `plot' #$j in ",
- "`$config_filename'.\n";
+ warn "$0: error: must set '$option' for 'plot' #$j in ",
+ "'$config_filename'.\n";
++$number_errors;
}
}
@@ -695,7 +695,7 @@
# Quit now if there were any required options that were not set
# since use of then will cause uninitialized warnings.
if ($required_error) {
- die "$0: loading configuration file `$config_filename' got ",
+ die "$0: loading configuration file '$config_filename' got ",
"$number_errors error(s).\n";
}
@@ -755,8 +755,8 @@
} else {
$data_type = 'GAUGE';
my $l = $k + 1;
- warn "$0: error: `plot' #$j `data_type #$l `$data_type' in ",
- "`$config_filename' must be gauge, counter, derive, or ",
+ warn "$0: error: 'plot' #$j 'data_type #$l '$data_type' in ",
+ "'$config_filename' must be gauge, counter, derive, or ",
"absolute.\n";
++$number_errors;
}
@@ -768,15 +768,15 @@
# group's name with its index.
my $source = delete $plot->{source};
unless (defined $source) {
- warn "$0: error: plot #$j `source $source' requires one group_name ",
- "argument in `$config_filename'.\n";
+ warn "$0: error: plot #$j 'source $source' requires one group_name ",
+ "argument in '$config_filename'.\n";
++$number_errors;
next;
}
my $source_index = $pcl_group_name_to_index{$source};
unless (defined $source_index) {
- warn "$0: error: plot #$j `source $source' references non-existant ",
- "`group' in `$config_filename'.\n";
+ warn "$0: error: plot #$j 'source $source' references non-existant ",
+ "'group' in '$config_filename'.\n";
++$number_errors;
next;
}
@@ -814,7 +814,7 @@
} else {
$line_type = 'LINE1';
my $l = $k + 1;
- warn "$0: error: `plot' #$j illegal `line_type' #$l `$line_type'.\n";
+ warn "$0: error: 'plot' #$j illegal 'line_type' #$l '$line_type'.\n";
++$number_errors;
}
$plot->{line_type}[$k] = $line_type;
@@ -840,7 +840,7 @@
}
if ($number_errors) {
- die "$0: loading configuration file `$config_filename' got ",
+ die "$0: loading configuration file '$config_filename' got ",
"$number_errors error(s).\n";
}
@@ -880,8 +880,8 @@
push(@line, 1) unless @line;
} else {
unless (@line) {
- warn "$0: warning: option `$key' needs arguments in ",
- "`$config_filename' line $line_number.\n";
+ warn "$0: warning: option '$key' needs arguments in ",
+ "'$config_filename' line $line_number.\n";
++$number_errors;
return;
}
@@ -923,7 +923,7 @@
$pcl_elements_ref = \%pcl_group_elements;
$pcl_keep_as_array_ref = \%pcl_group_keep_as_array;
$pcl_append_elements_ref = \%pcl_group_append_elements;
- $label = "group `$pcl_group_name'";
+ $label = "group '$pcl_group_name'";
} elsif (substr($pcl_plot_index, 0, 1) ne '-') {
$index_ref = \$pcl_plot_index;
$config_ref = \@config_plots;
@@ -942,8 +942,8 @@
}
unless ($pcl_elements_ref->{$key}) {
- warn "$0: warning: directive `$key' unknown for $label at line ",
- "$line_number in `$config_filename'.\n";
+ warn "$0: warning: directive '$key' unknown for $label at line ",
+ "$line_number in '$config_filename'.\n";
++$number_errors;
return;
}
@@ -962,8 +962,8 @@
}
if (defined $config_ref->[$$index_ref]{$key}) {
- warn "$0: warning: `$key' for $label already defined at line ",
- "$line_number in `$config_filename'.\n";
+ warn "$0: warning: '$key' for $label already defined at line ",
+ "$line_number in '$config_filename'.\n";
++$number_errors;
return;
}
@@ -991,23 +991,23 @@
if ($key eq 'group') {
unless (@line) {
die "$0: error: group needs a group name followed by { at ",
- "line $line_number in `$config_filename'.\n"
+ "line $line_number in '$config_filename'.\n"
}
$pcl_group_index =~ s:^-::;
$pcl_group_name = shift(@line);
unless (@line == 1 and $line[0] eq '{' ) {
if ($pcl_group_name eq '{') {
- warn "$0: warning: 'group_name {' required after `group' at ",
- "line $line_number in `$config_filename'.\n";
+ warn "$0: warning: 'group_name {' required after 'group' at ",
+ "line $line_number in '$config_filename'.\n";
} else {
- warn "$0: warning: '{' required after `group $pcl_group_name' at ",
- "line $line_number in `$config_filename'.\n";
+ warn "$0: warning: '{' required after 'group $pcl_group_name' at ",
+ "line $line_number in '$config_filename'.\n";
}
++$number_errors;
}
if (defined $pcl_group_name_to_index{$pcl_group_name}) {
- warn "$0: warning: `group $key' at line $line_number in ",
- "`$config_filename' previously defined.\n";
+ warn "$0: warning: 'group $key' at line $line_number in ",
+ "'$config_filename' previously defined.\n";
++$number_errors;
}
$config_groups[$pcl_group_index]{index} = $pcl_group_index;
@@ -1023,15 +1023,15 @@
unless (@line == 1 and $line[0] eq '{') {
$label = "@line";
$label = " $label" if $label;
- warn "$0: warning: '{' required immediately after plot in `plot$label' ",
- "at line $line_number in `$config_filename'.\n";
+ warn "$0: warning: '{' required immediately after plot in 'plot$label' ",
+ "at line $line_number in '$config_filename'.\n";
++$number_errors;
}
return;
}
- warn "$0: warning: unknown directive `$key' at line $line_number in ",
- "`$config_filename'.\n";
+ warn "$0: warning: unknown directive '$key' at line $line_number in ",
+ "'$config_filename'.\n";
++$number_errors;
}
@@ -1039,7 +1039,7 @@
my $config_filename = shift;
open(CONFIG, $config_filename) or
- die "$0: error: cannot open `$config_filename' for reading: $!\n";
+ die "$0: error: cannot open '$config_filename' for reading: $!\n";
# These values hold the information from the config file.
my %options;
@@ -1080,7 +1080,7 @@
}
close(CONFIG) or
- warn "$0: error in closing `$config_filename': $!\n";
+ warn "$0: error in closing '$config_filename': $!\n";
check_config($config_filename);
}
Modified: trunk/orca/lib/Orca/Constants.pm
==============================================================================
--- trunk/orca/lib/Orca/Constants.pm (original)
+++ trunk/orca/lib/Orca/Constants.pm Sun Jan 18 16:21:10 2004
@@ -92,7 +92,7 @@
foreach my $title (@CONST_IMAGE_PLOT_TYPES) {
unless (defined $CONST_IMAGE_PLOT_INFO{$title}) {
- die "$0: internal error: element `$title' in ",
+ die "$0: internal error: element '$title' in ",
"\@CONST_IMAGE_PLOT_TYPES is not a key in ",
"\%CONST_IMAGE_PLOT_INFO.\n";
}
Modified: trunk/orca/lib/Orca/HTMLFile.pm
==============================================================================
--- trunk/orca/lib/Orca/HTMLFile.pm (original)
+++ trunk/orca/lib/Orca/HTMLFile.pm Sun Jan 18 16:21:10 2004
@@ -34,7 +34,7 @@
local *FD;
unless (open(FD, "> $filename.htm")) {
- $@ = "cannot open `$filename.htm' for writing: $!";
+ $@ = "cannot open '$filename.htm' for writing: $!";
return;
}
@@ -178,9 +178,9 @@
my $filename = $self->[I_FILENAME];
close($self->[I_FD]) or
- warn "$0: warning: cannot close `$filename.htm': $!\n";
+ warn "$0: warning: cannot close '$filename.htm': $!\n";
rename("$filename.htm", $filename) or
- warn "$0: cannot rename `$filename.htm' to `$filename': $!\n";
+ warn "$0: cannot rename '$filename.htm' to '$filename': $!\n";
}
1;
Modified: trunk/orca/lib/Orca/ImageFile.pm
==============================================================================
--- trunk/orca/lib/Orca/ImageFile.pm (original)
+++ trunk/orca/lib/Orca/ImageFile.pm Sun Jan 18 16:21:10 2004
@@ -80,7 +80,7 @@
# Create the html_dir directories if necessary.
unless (-d $html_dir) {
- warn "$0: making directory `$html_dir'.\n";
+ warn "$0: making directory '$html_dir'.\n";
recursive_mkdir($html_dir);
}
my $image_basename = "$html_dir/$name";
@@ -310,7 +310,7 @@
}
my $image_filename = "$self->[I_IMAGE_BASENAME]-$plot_type.$IMAGE_SUFFIX";
- print " Creating `$image_filename'.\n" if $opt_verbose > 1;
+ print " Creating '$image_filename'.\n" if $opt_verbose > 1;
my $plot_ref = $self->[I_PLOT_REF];
@@ -326,14 +326,14 @@
'COMMENT:\s',
'COMMENT:Last data entered at ' . localtime($plot_end_time) . '.';
if (my $error = RRDs::error) {
- warn "$0: warning: cannot create `$image_filename': $error\n";
+ warn "$0: warning: cannot create '$image_filename': $error\n";
return;
} else {
$self->[$time_update_index] = $plot_end_time;
$self->[I_IMAGE_HEIGHT] = $image_height;
$self->[I_IMAGE_WIDTH] = $image_width;
utime $plot_end_time, $plot_end_time, $image_filename or
- warn "$0: warning: cannot change mtime for `$image_filename': $!\n";
+ warn "$0: warning: cannot change mtime for '$image_filename': $!\n";
# Expire the image at the correct time using a META file if
# requested.
@@ -343,9 +343,9 @@
_expire_string($plot_end_time + $plot_age + 30),
"\n";
close(META) or
- warn "$0: warning: cannot close `$image_filename.meta': $!\n";
+ warn "$0: warning: cannot close '$image_filename.meta': $!\n";
} else {
- warn "$0: warning: cannot open `$image_filename.meta' for writing: $!\n";
+ warn "$0: warning: cannot open '$image_filename.meta' for writing: $!\n";
}
}
}
Modified: trunk/orca/lib/Orca/NewState.pm
==============================================================================
--- trunk/orca/lib/Orca/NewState.pm (original)
+++ trunk/orca/lib/Orca/NewState.pm Sun Jan 18 16:21:10 2004
@@ -59,7 +59,7 @@
$type eq '@' ? \@ {"${caller_package}::$symbol"} :
$type eq '%' ? \% {"${caller_package}::$symbol"} :
do {
- confess "$0: internal error: Orca::NewState::save_variables cannot save `$var'.\n";
+ confess "$0: internal error: Orca::NewState::save_variables cannot save '$var'.\n";
}
);
use strict;
@@ -105,21 +105,21 @@
return unless -r $filename;
- print "Loading state from `$filename'.\n" if $opt_verbose;
+ print "Loading state from '$filename'.\n" if $opt_verbose;
if (open(STATE, $filename)) {
binmode(STATE);
my $result = $self->_load_state($filename, \*STATE);
close(STATE) or
- warn "$0: error in closing `$filename' for reading: $!\n";
+ warn "$0: error in closing '$filename' for reading: $!\n";
if (defined $result) {
return $result;
} else {
- warn "$0: cannot use state file `$filename'.\n";
+ warn "$0: cannot use state file '$filename'.\n";
return;
}
} else {
- warn "$0: cannot open `$filename' for reading: $!.\n";
+ warn "$0: cannot open '$filename' for reading: $!.\n";
return;
}
}
@@ -137,28 +137,28 @@
my $line = <$fd>;
chomp($line);
unless ($line) {
- warn "$0: ignoring unknown version state file `$filename'.\n";
+ warn "$0: ignoring unknown version state file '$filename'.\n";
return;
}
if ($line =~ /_filename/) {
- warn "$0: ignoring old state file `$filename'.\n";
+ warn "$0: ignoring old state file '$filename'.\n";
return;
}
my ($version, $number_objects) = $line =~ /(\d+\.\d+)\D+(\d+)/;
unless ($version) {
- warn "$0: ignoring unknown version state file `$filename'.\n";
+ warn "$0: ignoring unknown version state file '$filename'.\n";
return;
}
if ($version < $required_version) {
- warn "$0: ignoring old $version state file `$filename' when version $required_version is required.\n";
+ warn "$0: ignoring old $version state file '$filename' when version $required_version is required.\n";
return;
}
unless ($number_objects) {
- warn "$0: cannot detmine number of objects in state file `$filename'.\n";
+ warn "$0: cannot detmine number of objects in state file '$filename'.\n";
return;
}
unless ($number_objects == @store_restore_list) {
- warn "$0: incorrect number of saved objects in state file `$filename'.\n";
+ warn "$0: incorrect number of saved objects in state file '$filename'.\n";
return;
}
@@ -182,10 +182,10 @@
};
}
if ($@) {
- warn "$0: warning: cannot read state file `$filename': $@\n";
+ warn "$0: warning: cannot read state file '$filename': $@\n";
return;
} elsif (!$ok) {
- warn "$0: warning: cannot load data from state file `$filename': $!\n";
+ warn "$0: warning: cannot load data from state file '$filename': $!\n";
return;
}
@@ -212,10 +212,10 @@
my ($self, $filename) = @_;
my $tmp_filename = "$filename.tmp";
- print "Saving state into `$filename'.\n" if $opt_verbose;
+ print "Saving state into '$filename'.\n" if $opt_verbose;
unless (open(STATE, "> $tmp_filename")) {
- warn "$0: cannot open `$tmp_filename' for writing: $!\n";
+ warn "$0: cannot open '$tmp_filename' for writing: $!\n";
return;
}
@@ -229,23 +229,23 @@
}
unless ($result) {
- warn "$0: error in writing to `$tmp_filename': $!\n";
+ warn "$0: error in writing to '$tmp_filename': $!\n";
}
unless (close(STATE)) {
$result = 0;
- warn "$0: error in closing `$tmp_filename' for writing: $!\n";
+ warn "$0: error in closing '$tmp_filename' for writing: $!\n";
}
unless ($result) {
- warn "$0: cannot flush state to file `$tmp_filename': $!\n";
+ warn "$0: cannot flush state to file '$tmp_filename': $!\n";
unlink($tmp_filename) or
- warn "$0: error in unlinking `$tmp_filename': $!\n";
+ warn "$0: error in unlinking '$tmp_filename': $!\n";
return;
}
unless (rename($tmp_filename, $filename)) {
- warn "$0: cannot rename `$tmp_filename' to `$filename': $!\n";
+ warn "$0: cannot rename '$tmp_filename' to '$filename': $!\n";
return;
}
Modified: trunk/orca/lib/Orca/OldState.pm
==============================================================================
--- trunk/orca/lib/Orca/OldState.pm (original)
+++ trunk/orca/lib/Orca/OldState.pm Sun Jan 18 16:21:10 2004
@@ -35,11 +35,11 @@
my $state_file = shift;
unless (open(STATE, $state_file)) {
- warn "$0: warning: cannot open state file `$state_file' for reading: $!\n";
+ warn "$0: warning: cannot open state file '$state_file' for reading: $!\n";
return;
}
- print "Loading state from `$state_file'.\n" if $opt_verbose;
+ print "Loading state from '$state_file'.\n" if $opt_verbose;
# Get the first line which contains the hash key name. Check that
# the first field is _filename.
@@ -48,7 +48,7 @@
chomp($line);
my @keys = split(' ', $line);
unless ($keys[0] eq '_filename') {
- warn "$0: warning: ignoring state file `$state_file': incorrect first field.\n";
+ warn "$0: warning: ignoring state file '$state_file': incorrect first field.\n";
return;
}
@@ -57,7 +57,7 @@
while (<STATE>) {
my @line = split;
if (@line != 3 && @line < 8) {
- warn "$0: incorrect number of elements on line $. of `$state_file'.\n";
+ warn "$0: incorrect number of elements on line $. of '$state_file'.\n";
next;
}
@@ -78,7 +78,7 @@
}
close(STATE) or
- warn "$0: warning: cannot close `$state_file' for reading: $!\n";
+ warn "$0: warning: cannot close '$state_file' for reading: $!\n";
1;
}
@@ -91,7 +91,7 @@
my ($state_file, $state_ref) = @_;
- print "Saving state into `$state_file'.\n" if $opt_verbose;
+ print "Saving state into '$state_file'.\n" if $opt_verbose;
if (open(STATE, "> $state_file.tmp")) {
@@ -127,18 +127,18 @@
$print_warning = !rename("$state_file.tmp", $state_file);
} else {
$print_warning = 0;
- warn "$0: warning: cannot unlink old `$state_file': $!\n";
+ warn "$0: warning: cannot unlink old '$state_file': $!\n";
}
}
if ($print_warning) {
- warn "$0: warning: cannot rename `$state_file.tmp' to `$state_file': $!\n";
+ warn "$0: warning: cannot rename '$state_file.tmp' to '$state_file': $!\n";
}
}
} else {
- warn "$0: warning: cannot close `$state_file' for writing: $!\n";
+ warn "$0: warning: cannot close '$state_file' for writing: $!\n";
}
} else {
- warn "$0: warning: cannot open state file `$state_file.tmp' for writing: $!\n";
+ warn "$0: warning: cannot open state file '$state_file.tmp' for writing: $!\n";
}
}
Modified: trunk/orca/lib/Orca/OpenFileHash.pm
==============================================================================
--- trunk/orca/lib/Orca/OpenFileHash.pm (original)
+++ trunk/orca/lib/Orca/OpenFileHash.pm Sun Jan 18 16:21:10 2004
@@ -79,7 +79,7 @@
my $open_error = 0;
while (!open(FD, $filename)) {
my $num_current_open_files = keys %{$self->[I_HASH]};
- warn "$0: warning: cannot open `$filename' for reading: $!\n";
+ warn "$0: warning: cannot open '$filename' for reading: $!\n";
warn "$0: warning: there are current $num_current_open_files open source ",
"files.\n";
return unless $num_current_open_files;
@@ -95,7 +95,7 @@
}
if ($open_error) {
- warn "$0: warning: finally able to open `$filename' for reading.\n";
+ warn "$0: warning: finally able to open '$filename' for reading.\n";
}
$self->add($fid, $weight, *FD, $is_pipe);
@@ -144,11 +144,11 @@
unless ($close_value) {
if ($is_pipe) {
if ($is_eof) {
- warn "$0: warning: cannot close pipe for `$filename': ",
+ warn "$0: warning: cannot close pipe for '$filename': ",
"[$close_value \$?=$?] $!\n" if $opt_verbose > 1;
}
} else {
- warn "$0: warning: cannot close `$filename': [$close_value] $!\n";
+ warn "$0: warning: cannot close '$filename': [$close_value] $!\n";
}
}
Modified: trunk/orca/lib/Orca/RRDFile.pm
==============================================================================
--- trunk/orca/lib/Orca/RRDFile.pm (original)
+++ trunk/orca/lib/Orca/RRDFile.pm Sun Jan 18 16:21:10 2004
@@ -59,7 +59,7 @@
my $dir = "$config_global{rrd_dir}/" .
name_to_fsname("${group_name}_${subgroup_name}", 0);
unless (-d $dir) {
- warn "$0: making directory `$dir'.\n";
+ warn "$0: making directory '$dir'.\n";
recursive_mkdir($dir);
}
my $rrd_filename = "$dir/$data_expression.rrd";
@@ -86,7 +86,7 @@
if (-e $rrd_filename) {
my $update_time = RRDs::last $rrd_filename;
if (my $error = RRDs::error) {
- warn "$0: RRDs::last error: `$rrd_filename' $error\n";
+ warn "$0: RRDs::last error: '$rrd_filename' $error\n";
} else {
if (open(RRDFILE, "<$rrd_filename")) {
my $version = '';
@@ -97,7 +97,7 @@
}
}
close(RRDFILE) or
- warn "$0: error in closing `$rrd_filename' for reading: $!\n";
+ warn "$0: error in closing '$rrd_filename' for reading: $!\n";
# Compare the version number of file to the required version.
if (length($version)) {
@@ -105,10 +105,10 @@
$self->[I_RRD_UPDATE_TIME] = $update_time;
$self->[I_RRD_VERSION] = $version;
} else {
- warn "$0: old version $version RRD `$rrd_filename' found: will create new version $ORCA_RRD_VERSION file.\n";
+ warn "$0: old version $version RRD '$rrd_filename' found: will create new version $ORCA_RRD_VERSION file.\n";
}
} else {
- warn "$0: unknown version RRD `$rrd_filename' found: will create new version $ORCA_RRD_VERSION file.\n";
+ warn "$0: unknown version RRD '$rrd_filename' found: will create new version $ORCA_RRD_VERSION file.\n";
}
}
}
@@ -208,7 +208,7 @@
# Now do the actual creation.
if ($opt_verbose) {
- print " Creating RRD `$rrd_filename'";
+ print " Creating RRD '$rrd_filename'";
if ($opt_verbose > 2) {
print " with options ", join(' ', @options[1..$#options]);
}
@@ -217,7 +217,7 @@
RRDs::create @options;
if (my $error = RRDs::error) {
- warn "$0: RRDs::create error: `$rrd_filename' $error\n";
+ warn "$0: RRDs::create error: '$rrd_filename' $error\n";
return;
}
}
@@ -233,7 +233,7 @@
if (my $error = RRDs::error) {
warn "$0: warning: cannot put data starting at ",
scalar localtime($times[0]),
- " ($times[0]) into `$rrd_filename': $error\n";
+ " ($times[0]) into '$rrd_filename': $error\n";
return 0;
}
Modified: trunk/orca/lib/Orca/SourceFile.pm
==============================================================================
--- trunk/orca/lib/Orca/SourceFile.pm (original)
+++ trunk/orca/lib/Orca/SourceFile.pm Sun Jan 18 16:21:10 2004
@@ -152,9 +152,9 @@
$self->[I_FIRST_LINE] = 1;
@column_description = split(' ', $line);
} else {
- warn "$0: warning: no first_line for `$filename' yet.\n";
+ warn "$0: warning: no first_line for '$filename' yet.\n";
$open_file_cache->close($fid) or
- warn "$0: warning: cannot close `$filename' for reading: $!\n";
+ warn "$0: warning: cannot close '$filename' for reading: $!\n";
return;
}
}
@@ -240,7 +240,7 @@
}
unless ($found > -1) {
- warn "$0: warning: cannot find date `$date_column_name' in `$sfile_fids[$fid]'.\n";
+ warn "$0: warning: cannot find date '$date_column_name' in '$sfile_fids[$fid]'.\n";
warn "@{$self->[I_COLUMN_DESCRIPTION]}\n";
return;
}
@@ -366,7 +366,7 @@
$regexp_pos[$i] = @column_description;
# Start by making a deep copy of the plot. Be careful not to make
- # a deep copy of the `creates' reference, since it can cause
+ # a deep copy of the 'creates' reference, since it can cause
# recursion. Replace the regular expression in the first data
# with the name of the column that caused the match.
my $creates = delete $plot->{creates};
@@ -483,7 +483,7 @@
++$regexp_pos[$i];
# Start by making a deep copy of the plot. Be careful not to make
- # a deep copy of the `creates' reference, since it can cause
+ # a deep copy of the 'creates' reference, since it can cause
# recursion. Replace the regular expression in the first data
# with the name of the column that caused the match. Then create
# string form of the plot object using Data::Dumper::Dumper and
@@ -554,8 +554,8 @@
} elsif (defined $group_column_names[$group_index]{$element}) {
my $m = $old_i + 1;
if ($required) {
- warn "$0: $element in `data @{$plot->{data}[$j]}' in plot #$m ",
- "not replaced since it is not in file `",
+ warn "$0: $element in 'data @{$plot->{data}[$j]}' in plot #$m ",
+ "not replaced since it is not in file '",
$self->filename, "'.\n";
}
$datas[$j] = undef;
@@ -566,7 +566,7 @@
if (!$match_one_data and $opt_verbose > 1) {
my $m = $old_i + 1;
warn "$0: warning: no substitutions performed for ",
- "`data @{$plot->{data}[$j]}' in plot #$m in `",
+ "'data @{$plot->{data}[$j]}' in plot #$m in '",
$self->filename, "'.\n";
}
}
@@ -612,11 +612,11 @@
$eval_result = 0;
$@ =~ s/\s+$//g;
my $m = $old_i + 1;
- $message = "$0: warning: cannot compile `$sub_expr' for plot #$m `data @{$plot->{data}[$j]}': $@\n";
+ $message = "$0: warning: cannot compile '$sub_expr' for plot #$m 'data @{$plot->{data}[$j]}': $@\n";
} elsif (!defined $test_value) {
$eval_result = 0;
my $m = $old_i + 1;
- $message = "$0: warning: testing of `$sub_expr' for plot #$m `data @{$plot->{data}[$j]}' yielded an undefined value.\n";
+ $message = "$0: warning: testing of '$sub_expr' for plot #$m 'data @{$plot->{data}[$j]}' yielded an undefined value.\n";
}
if ($message and ($required or $opt_verbose > 1)) {
warn $message;
@@ -765,7 +765,7 @@
my $fd = $open_file_cache->get_fd($fid);
my $load_data = $file_status != 0;
if ($file_status == -1) {
- my $message = "file `$sfile_fids[$fid]' did exist and is now gone.";
+ my $message = "file '$sfile_fids[$fid]' did exist and is now gone.";
email_message($config_global{warn_email}, $message);
warn "$0: warning: $message\n";
unless ($fd) {
@@ -784,7 +784,7 @@
if ($old_is_current and
!$self->[I_IS_CURRENT] and
($old_is_current_day == $current_day)) {
- my $message = "file `$sfile_fids[$fid]' was current and now is not.";
+ my $message = "file '$sfile_fids[$fid]' was current and now is not.";
warn "$0: warning: $message\n";
email_message($config_global{warn_email}, $message);
}
@@ -818,7 +818,7 @@
my $opened_new_fd = 0;
unless ($fd) {
unless ($fd = $open_file_cache->open($fid, $file_mtime)) {
- warn "$0: warning: cannot open `$sfile_fids[$fid]' for reading: $!\n";
+ warn "$0: warning: cannot open '$sfile_fids[$fid]' for reading: $!\n";
return 0;
}
<$fd> if $self->[I_FIRST_LINE];
@@ -853,7 +853,7 @@
# define the column names, 2) the number of columns loaded is not
# equal to the number of columns in the column description.
if ($self->[I_FIRST_LINE] and @line != $number_columns) {
- warn "$0: number of columns in line $. of `$sfile_fids[$fid]' does not ",
+ warn "$0: number of columns in line $. of '$sfile_fids[$fid]' does not ",
"match column description.\n";
next;
}
@@ -880,14 +880,14 @@
if (defined $value) {
if ($self->[I_ALL_RRD_REF]{$rrd_key}->queue_data($time, $value)) {
if ($opt_verbose > 2 and !$add) {
- print " Loaded `@line' at ", scalar localtime($time), " ($time).\n";
+ print " Loaded '@line' at ", scalar localtime($time), " ($time).\n";
}
$add = 1;
}
} else {
$close_once_done = 1;
- warn "$0: internal error: expecting RRD name `$rrd_key' but no data ",
- "loaded from `", $self->filename, "' at time ",
+ warn "$0: internal error: expecting RRD name '$rrd_key' but no data ",
+ "loaded from '", $self->filename, "' at time ",
scalar localtime($time), " ($time).\n";
}
}
@@ -909,7 +909,7 @@
# should be reopened next time.
if ($file_status == 2 and !$opened_new_fd) {
$open_file_cache->close($fid) or
- warn "$0: warning: cannot close `$sfile_fids[$fid]' for reading: $!\n";
+ warn "$0: warning: cannot close '$sfile_fids[$fid]' for reading: $!\n";
# Setting the last_read_time to -1 will force load_new_data to
# read it.
$self->[I_LAST_READ_TIME] = -1;
@@ -919,7 +919,7 @@
$self->[I_REOPEN] or
$open_file_cache->is_pipe($fid)) {
$open_file_cache->close($fid) or
- warn "$0: warning: cannot close `$sfile_fids[$fid]' for reading: $!\n";
+ warn "$0: warning: cannot close '$sfile_fids[$fid]' for reading: $!\n";
}
$number_added;
Modified: trunk/orca/lib/Orca/SourceFileIDs.pm
==============================================================================
--- trunk/orca/lib/Orca/SourceFileIDs.pm (original)
+++ trunk/orca/lib/Orca/SourceFileIDs.pm Sun Jan 18 16:21:10 2004
@@ -51,7 +51,7 @@
} else {
my ($type, $symbol) = unpack('a1a*', $ref);
unless ($type eq '@') {
- confess "$0: internal error: Orca::SourceFileIDs::register_fid_arrays passed non-array variable name `$ref'.\n";
+ confess "$0: internal error: Orca::SourceFileIDs::register_fid_arrays passed non-array variable name '$ref'.\n";
}
if ($symbol =~ /::/) {
confess "$0: internal error: Orca::SourceFileIDs::register_fid_arrays cannot pass somebody else's variables.\n";
Modified: trunk/orca/lib/Orca/Utils.pm
==============================================================================
--- trunk/orca/lib/Orca/Utils.pm (original)
+++ trunk/orca/lib/Orca/Utils.pm Sun Jan 18 16:21:10 2004
@@ -167,14 +167,14 @@
# Find all of the files in the current directory that match the
# first regular expression.
unless (opendir(GLOB_DIR, "$current_dir")) {
- warn "$0: error: cannot opendir `$current_dir': $!\n";
+ warn "$0: error: cannot opendir '$current_dir': $!\n";
return ();
}
my @matches = grep { /^$first_regexp$/ } readdir(GLOB_DIR);
closedir(GLOB_DIR) or
- warn "$0: warning: cannot closedir `$current_dir': $!\n";
+ warn "$0: warning: cannot closedir '$current_dir': $!\n";
# If the last path element is being used as the regular expression,
# then just return the list of matching files with the current
@@ -187,7 +187,7 @@
# Otherwise we need to look into the directories below the current
# directory. Also create the next regular expression to use that is
# made up of the remaining file path elements. Make sure not to
- # process any directories named `..'.
+ # process any directories named '..'.
my @results;
my $new_regexp = join('/', @regexp_elements);
foreach my $new_dir (grep { $_ ne '..' and -d "$current_dir/$_" } @matches) {
@@ -229,7 +229,7 @@
$path = "$path/$element";
next if -d $path;
unless (mkdir($path, 0755)) {
- die "$0: error: unable to create `$path': $!\n";
+ die "$0: error: unable to create '$path': $!\n";
}
}
}
Modified: trunk/orca/orca/orca.pl.in
==============================================================================
--- trunk/orca/orca/orca.pl.in (original)
+++ trunk/orca/orca/orca.pl.in Sun Jan 18 16:21:10 2004
@@ -116,7 +116,7 @@
Usage("no configuration file specified") unless @ARGV == 1;
my $config_filename = shift;
unless (-r $config_filename) {
- die "$0: no configuration file `$config_filename' to read.\n";
+ die "$0: no configuration file '$config_filename' to read.\n";
}
load_config($config_filename);
@@ -138,7 +138,7 @@
# Now try to create the locking directory.
unless (mkdir($locking_directory, 0755)) {
- die "$0: cannot create locking directory `$locking_directory': $!\n";
+ die "$0: cannot create locking directory '$locking_directory': $!\n";
}
$rmdir_locking_directory = 1;
@@ -154,7 +154,7 @@
}
if ($opt_log_filename) {
open(STDOUT, ">>$opt_log_filename") or
- die "$0: cannot open `$opt_log_filename' for writing: $!\n";
+ die "$0: cannot open '$opt_log_filename' for writing: $!\n";
}
# If Orca should daemonize itself, then do so now. Find POSIX::setsid
@@ -168,8 +168,8 @@
if ($@) {
die "$0: cannot get setsid since eval '$expr' failed: $@\n";
}
- chdir('/') or die "$0: cannot chdir `/': $!\n";
- open(STDIN, '/dev/null') or die "$0: cannot read `/dev/null': $!\n";
+ chdir('/') or die "$0: cannot chdir '/': $!\n";
+ open(STDIN, '/dev/null') or die "$0: cannot read '/dev/null': $!\n";
defined(my $pid = fork) or die "$0: cannot fork: $!\n";
exit if $pid;
POSIX::setsid() or die "$0: cannot start a new session: $!\n";
@@ -216,7 +216,7 @@
unless (chdir($start_cwd)) {
$ok = 0;
if ($can_print) {
- warn "$0: cannot chdir `$start_cwd': $!\n";
+ warn "$0: cannot chdir '$start_cwd': $!\n";
}
}
}
@@ -224,7 +224,7 @@
if ($ok and -d $locking_directory) {
unless (rmdir($locking_directory)) {
if ($can_print) {
- warn "$0: cannot rmdir `$locking_directory': $!\n";
+ warn "$0: cannot rmdir '$locking_directory': $!\n";
}
}
}
@@ -269,7 +269,7 @@
if ($image_filename) {
if (/CLOSE/) {
close(ORCA_WRITE) or
- warn "$0: error in closing `$image_filename' for writing: $!\n";
+ warn "$0: error in closing '$image_filename' for writing: $!\n";
$image_filename = '';
} else {
chomp;
@@ -283,14 +283,14 @@
# binary mode.
binmode ORCA_WRITE;
} else {
- warn "$0: cannot open `$image_filename' for writing: $!\n";
+ warn "$0: cannot open '$image_filename' for writing: $!\n";
$image_filename = '';
}
}
}
if ($image_filename) {
close(ORCA_WRITE) or
- warn "$0: error in closing `$image_filename' for writing: $!\n";
+ warn "$0: error in closing '$image_filename' for writing: $!\n";
$image_filename = '';
}
}
@@ -440,7 +440,7 @@
$this_subgroup_rrds{$rrd} = $rrd_data_files_ref->{$rrd};
}
if ($opt_verbose) {
- printf " Read %5d data point%s from `$sfile_fids[$fid]'.\n",
+ printf " Read %5d data point%s from '$sfile_fids[$fid]'.\n",
$number, $number > 1 ? 's' : '';
}
}
@@ -597,7 +597,7 @@
$make_html_all_page = 0;
}
- print "Creating HTML files in `$html_dir/'.\n" if $opt_verbose;
+ print "Creating HTML files in '$html_dir/'.\n" if $opt_verbose;
# Create the main HTML index.html file.
my $index_html = Orca::HTMLFile->new($index_filename,
@@ -1010,8 +1010,8 @@
push(@fids, perl_glob($regexp));
}
unless (@fids) {
- warn "$0: warning: no files found for `find_files' for `group ",
- "$group_name' in `$config_filename'.\n";
+ warn "$0: warning: no files found for 'find_files' for 'group ",
+ "$group_name' in '$config_filename'.\n";
next;
}
@@ -1036,7 +1036,7 @@
}
}
unless (defined $subgroup) {
- warn "$0: warning: internal error: found `$filename' but no ",
+ warn "$0: warning: internal error: found '$filename' but no ",
"regexp match for it.\n";
next;
}
@@ -1087,7 +1087,7 @@
print " $sfile_fids[$fid]\n" if $opt_verbose > 2;
my $data_file = Orca::SourceFile->new($group_index, $fid);
unless ($data_file) {
- warn "$0: warning: cannot process `$sfile_fids[$fid]'.\n";
+ warn "$0: warning: cannot process '$sfile_fids[$fid]'.\n";
splice(@fids, $j, 1);
next;
}
@@ -1120,7 +1120,7 @@
my @found_files = keys %new_found_files;
unless (@found_files) {
- die "$0: no data files found. Make sure `find_files' parameter is set ",
+ die "$0: no data files found. Make sure 'find_files' parameter is set ",
"properly.\n";
}
@@ -1738,7 +1738,7 @@
the B<date_source> parameter can be used. The value for B<date_parse>
is a Perl subroutine that accepts two arguments, the first being the
name of the file where the data is loaded and the second the string
-from the `date_source' column that contains some time information.
+from the 'date_source' column that contains some time information.
The subroutine should return the Unix epoch time. If this parameter
is not specified, then Orca assumes that the string holds the Unix
epoch time.
@@ -2274,7 +2274,7 @@
used for all of the data summary lines that were not given a
summary_format. In the example above, there are four data's and only
two summary_format's. The format '%4.1f %s' will be used for the
-`things' and `something_else' data summary lines.
+'things' and 'something_else' data summary lines.
=back
More information about the Orca-checkins
mailing list