Modify Aeron publishers and subscribers

RoboTradeCode · May 24, 2022 · fd5715c · fd5715c
1 parent 4544ed1
commit fd5715c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/kernel/balancer_by_market_order.php b/kernel/balancer_by_market_order.php
@@ -4,6 +4,7 @@
 use Src\Configurator;
 use Src\Core;
 use Src\Gate;
+use Aeron\Publisher;
 
 require dirname(__DIR__) . '/index.php';
 require dirname(__DIR__) . '/config/common_config.php';
@@ -23,7 +24,8 @@
 $robotrade_api = new Api($common_config['exchange'], $common_config['algorithm'], $common_config['node'], $common_config['instance']);
 
 // нужен publisher, отправлять команды по aeron в гейт
-$publisher = new AeronPublisher($config['aeron']['publishers']['gate']['channel'], $config['aeron']['publishers']['gate']['stream_id']);
+$publisher = new Publisher($config['aeron']['publishers']['gate']['channel'], $config['aeron']['publishers']['gate']['stream_id']);
+sleep(1);
 
 // класс для работы с гейтом
 $gate = new Gate($publisher, $robotrade_api, $common_config['gate_sleep'] ?? 0);

diff --git a/kernel/cross_3t.php b/kernel/cross_3t.php
@@ -5,6 +5,7 @@
 use Src\Core;
 use Src\Gate;
 use Src\Cross3T;
+use Aeron\Publisher;
 
 require dirname(__DIR__) . '/index.php';
 require dirname(__DIR__) . '/config/common_config.php';
@@ -25,7 +26,8 @@
 $robotrade_api = new Api($common_config['exchange'], $common_config['algorithm'], $common_config['node'], $common_config['instance']);
 
 // нужен publisher, отправлять команды по aeron в гейт
-$publisher = new AeronPublisher($config['aeron']['publishers']['gate']['channel'], $config['aeron']['publishers']['gate']['stream_id']);
+$publisher = new Publisher($config['aeron']['publishers']['gate']['channel'], $config['aeron']['publishers']['gate']['stream_id']);
+sleep(1);
 
 // создаем класс cross 3t
 $cross_3t = new Cross3T($config, $common_config);

diff --git a/kernel/receive_data.php b/kernel/receive_data.php
@@ -4,6 +4,8 @@
 use Src\Configurator;
 use Src\DiscreteTime;
 use Src\Log;
+use Aeron\Publisher;
+use Aeron\Subscriber;
 
 require dirname(__DIR__) . '/index.php';
 require dirname(__DIR__) . '/config/common_config.php';
@@ -29,7 +31,8 @@
 }
 
 // нужен publisher, отправлять логи на сервер логов
-$publisher = new AeronPublisher($config['aeron']['publishers']['log']['channel'], $config['aeron']['publishers']['log']['stream_id']);
+$publisher = new Publisher($config['aeron']['publishers']['log']['channel'], $config['aeron']['publishers']['log']['stream_id']);
+sleep(1);
 
 function handler_orderbooks(string $message): void
 {
@@ -100,13 +103,13 @@ function handler_balances(string $message): void
 }
 
 // subscribers подключения
-$subscriber_orderbooks = new AeronSubscriber('handler_orderbooks', $config['aeron']['subscribers']['orderbooks']['channel'], $config['aeron']['subscribers']['orderbooks']['stream_id']);
+$subscriber_orderbooks = new Subscriber('handler_orderbooks', $config['aeron']['subscribers']['orderbooks']['channel'], $config['aeron']['subscribers']['orderbooks']['stream_id']);
 
 foreach ($config['aeron']['subscribers']['orderbooks']['destinations'] as $destination) {
     $subscriber_orderbooks->addDestination($destination);
 }
 
-$subscriber_balances = new AeronSubscriber('handler_balances', $config['aeron']['subscribers']['balance']['channel'], $config['aeron']['subscribers']['balance']['stream_id']);
+$subscriber_balances = new Subscriber('handler_balances', $config['aeron']['subscribers']['balance']['channel'], $config['aeron']['subscribers']['balance']['stream_id']);
 
 foreach ($config['aeron']['subscribers']['balance']['destinations'] as $destination) {
     $subscriber_balances->addDestination($destination);

diff --git a/src/Gate.php b/src/Gate.php
@@ -2,25 +2,25 @@
 
 namespace Src;
 
-use AeronPublisher;
+use Aeron\Publisher;
 use robotrade\Api;
 
 class Gate
 {
 
-    private AeronPublisher $publisher;
+    private Publisher $publisher;
     private Api $robotrade_api;
     private array $commands;
     private int $sleep;
 
     /**
-     * Нужно передать объект класса AeronPublisher и Robotrade Api
+     * Нужно передать объект класса Publisher и Robotrade Api
      *
-     * @param AeronPublisher $publisher Gate AeronPublisher
+     * @param Publisher $publisher Gate Publisher
      * @param Api $robotrade_api Api create message to send command to Gate
      * @param int $sleep Sleep between gate commands
      */
-    public function __construct(AeronPublisher $publisher, Api $robotrade_api, int $sleep = 0)
+    public function __construct(Publisher $publisher, Api $robotrade_api, int $sleep = 0)
     {
 
         $this->publisher = $publisher;