Skip to content

Commit

Permalink
do not end error messages with a dot
Browse files Browse the repository at this point in the history
  • Loading branch information
kraih committed Jun 16, 2014
1 parent 27d7831 commit a9ab209
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 8 deletions.
4 changes: 1 addition & 3 deletions lib/Mojo/IOLoop.pm
Expand Up @@ -100,12 +100,10 @@ sub remove {

sub reset {
my $self = _instance(shift);

$self->_remove($_)
for keys %{$self->{acceptors}}, keys %{$self->{connections}};
$self->reactor->reset;
$self->_stop;
$self->stop;
$self->$_ for qw(_stop stop);
}

sub server {
Expand Down
2 changes: 1 addition & 1 deletion lib/Mojo/Server/Morbo.pm
Expand Up @@ -74,7 +74,7 @@ sub _manage {
sleep 1;
}

sub _reap { delete $_[0]->{running} while (waitpid -1, WNOHANG) > 0 }
sub _reap { delete $_[0]{running} while (waitpid -1, WNOHANG) > 0 }

sub _spawn {
my $self = shift;
Expand Down
2 changes: 1 addition & 1 deletion lib/Mojo/Template.pm
Expand Up @@ -240,7 +240,7 @@ sub render_file {
$self->name($path) unless defined $self->{name};
my $template = slurp $path;
my $encoding = $self->encoding;
croak qq{Template "$path" has invalid encoding.}
croak qq{Template "$path" has invalid encoding}
if $encoding && !defined($template = decode $encoding, $template);

return $self->render($template, @_);
Expand Down
2 changes: 1 addition & 1 deletion lib/Mojolicious/Plugin/JSONConfig.pm
Expand Up @@ -12,7 +12,7 @@ sub parse {
my $config = $json->decode($self->render($content, $file, $conf, $app));
my $err = $json->error;
die qq{Couldn't parse config "$file": $err} if !$config && $err;
die qq{Invalid config "$file".} if !$config || ref $config ne 'HASH';
die qq{Invalid config "$file"} if !$config || ref $config ne 'HASH';

return $config;
}
Expand Down
3 changes: 1 addition & 2 deletions lib/Test/Mojo.pm
Expand Up @@ -316,8 +316,7 @@ sub _request_ok {

# Establish WebSocket connection
if ($tx->req->is_handshake) {
$self->{messages} = [];
$self->{finished} = undef;
@$self{qw(finished messages)} = (undef, []);
$self->ua->start(
$tx => sub {
my ($ua, $tx) = @_;
Expand Down

0 comments on commit a9ab209

Please sign in to comment.