diff --git a/lib/MogileFS/Connection/Poolable.pm b/lib/MogileFS/Connection/Poolable.pm index 16704ff5..c68e6663 100644 --- a/lib/MogileFS/Connection/Poolable.pm +++ b/lib/MogileFS/Connection/Poolable.pm @@ -115,7 +115,7 @@ sub expired { return 0; } -# may be overriden in subclass, called only on errors +# may be overridden in subclass, called only on errors # The HTTP version of this will fake an HTTP response for LWP compatibility sub err { my ($self, $close_reason) = @_; diff --git a/lib/MogileFS/ProcManager.pm b/lib/MogileFS/ProcManager.pm index 44f411ce..fb573f0f 100644 --- a/lib/MogileFS/ProcManager.pm +++ b/lib/MogileFS/ProcManager.pm @@ -33,7 +33,7 @@ my %pending_work = (); # 'job' -> [aref of pending work] $IsChild = 0; # either false if we're the parent, or a MogileFS::Worker object # keep track of what all child pids are doing, and what jobs are being -# satisifed. +# satisfied. my %child = (); # pid -> MogileFS::Connection::Worker my %todie = (); # pid -> 1 (lists pids that we've asked to die) my %jobs = (); # jobname -> [ min, current ] diff --git a/lib/MogileFS/Store.pm b/lib/MogileFS/Store.pm index c6a7cf74..c12d732b 100644 --- a/lib/MogileFS/Store.pm +++ b/lib/MogileFS/Store.pm @@ -109,7 +109,7 @@ sub new_from_mogdbsetup { } # given a root DBI connection, create the named database. succeed -# if it it's made, or already exists. die otherwise. +# if it is made, or already exists. die otherwise. sub create_db_if_not_exists { my ($pkg, $rdbh, $dbname) = @_; $rdbh->do("CREATE DATABASE IF NOT EXISTS $dbname") @@ -622,7 +622,7 @@ sub TABLE_class { # and a class for derived images (scaled down versions, thumbnails, greyscale, etc) # each domain can setup classes and assign the minimum redundancy level for # each class. fotobilder will use a 2 or 3 minimum copy redundancy for original -# photos and and a 1 minimum for derived images (which means the sole device +# photos and a 1 minimum for derived images (which means the sole device # for a derived image can die, bringing devcount to 0 for that file, but # the application can recreate it from its original) sub TABLE_file { diff --git a/lib/MogileFS/Store/MySQL.pm b/lib/MogileFS/Store/MySQL.pm index 32a5a8b5..5d4e7e8c 100644 --- a/lib/MogileFS/Store/MySQL.pm +++ b/lib/MogileFS/Store/MySQL.pm @@ -42,7 +42,7 @@ sub was_deadlock_error { my $dbh = $self->dbh; return 0 unless $dbh->err; # 1205 is "lock wait timeout", but we should bomb out if we've - # alerady hung for that long. + # already hung for that long. return 1 if ($dbh->err == 1213); } diff --git a/lib/MogileFS/Store/Postgres.pm b/lib/MogileFS/Store/Postgres.pm index b057b967..5fd6db4c 100644 --- a/lib/MogileFS/Store/Postgres.pm +++ b/lib/MogileFS/Store/Postgres.pm @@ -31,7 +31,7 @@ sub dsn_of_root { sub want_raise_errors { 1 } # given a root DBI connection, create the named database. succeed -# if it it's made, or already exists. die otherwise. +# if it is made, or already exists. die otherwise. sub create_db_if_not_exists { my ($pkg, $rdbh, $dbname) = @_; if(not $rdbh->do("CREATE DATABASE $dbname TEMPLATE template0 ENCODING 'UTF-8'" )) {