Skip to content

Commit

Permalink
Merge branch 'master' of github.com:tamagokun/rackem
Browse files Browse the repository at this point in the history
  • Loading branch information
tamagokun committed Nov 26, 2013
2 parents d707033 + 173aa00 commit 941387a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 0 additions & 2 deletions lib/Rackem.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ public static function map($path, $app)

public static function run($app = null)
{
if(!$app) return false;

self::ensure_builder();
self::$builder->run($app);

Expand Down
4 changes: 2 additions & 2 deletions lib/Rackem/Server.php
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,8 @@ protected function init()
}
socket_set_nonblock($this->master);

echo "== Rackem on http://{$this->host}:{$this->port}\n";
echo ">> Rackem web server\n";
echo "== Rack'em on http://{$this->host}:{$this->port}\n";
echo ">> Rack'em web server\n";
echo ">> Listening on {$this->host}:{$this->port}, CTRL+C to stop\n";
pcntl_signal(SIGINT, array($this, "stop"));
pcntl_signal(SIGTERM, array($this, "stop"));
Expand Down

0 comments on commit 941387a

Please sign in to comment.