Skip to content

Getting changes from Lazyshot #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jofemodo wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Getting changes from Lazyshot #1

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
58c5b0b
Add heartbeat handling to work with Storm 0.9.3
nyoung Mar 9, 2015
f6406ad
Merge pull request #12 from nyoung/master
Lazyshot Dec 29, 2015
092a3a1
fix the debug mode and create file rule
Nov 17, 2016
c30e729
Merge pull request #15 from ouminghai/master
Lazyshot Feb 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 24 additions & 7 deletions lib/storm.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ public function __construct($debug = false)
$this->pid = getmypid();
$this->sendCommand(array( "pid" => $this->pid ));

$this->_debug = $debug;
$this->_DEBUG = $debug;

if ($this->_DEBUG)
{
$this->stormInc = fopen('/tmp/' . $this->pid . "_" . strtolower($_SERVER['argv'][0]) . '.txt', 'w+');
$this->stormInc = fopen('/tmp/' . $this->pid . "_" . strtolower(basename($_SERVER['argv'][0])) . '.txt', 'w+');
}

$handshake = $this->parseMessage( $this->waitForMessage() );
Expand Down Expand Up @@ -155,8 +155,12 @@ public function run()
$command);

$tuple = new Tuple($tupleMap['id'], $tupleMap['comp'], $tupleMap['stream'], $tupleMap['task'], $tupleMap['tuple']);

$this->process($tuple);

if ($tuple->task == -1 && $tuple->stream === '__heartbeat') {
$this->sync();
} else {
$this->process($tuple);
}
}
}
}
Expand Down Expand Up @@ -233,6 +237,15 @@ protected function fail(Tuple $tuple)

$this->sendCommand($command);
}

protected function sync()
{
$command = array(
'command' => 'sync'
);

$this->sendCommand($command);
}
}

abstract class BasicBolt extends ShellBolt
Expand Down Expand Up @@ -264,9 +277,13 @@ public function run()

try
{
$processed = $this->process($tuple);
if ($tuple->task == -1 && $tuple->stream === '__heartbeat') {
$this->sync();
} else {
$processed = $this->process($tuple);

$this->ack($tuple);
$this->ack($tuple);
}
}
catch (BoltProcessException $e)
{
Expand Down Expand Up @@ -299,7 +316,7 @@ public function __construct()
abstract protected function nextTuple();
abstract protected function ack($tuple_id);
abstract protected function fail($tuple_id);

public function run()
{
while (true)
Expand Down