Skip to content

Commit 2ab9f7a

Browse files
mikasoukhovmikasoukhov
committed
IMessageChannel. SendInMessage returns bool.
1 parent 65b62c5 commit 2ab9f7a

38 files changed

+157
-122
lines changed

‎Algo/BasketMessageAdapter.cs

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -783,9 +783,9 @@ private IMessageAdapter GetUnderlyingAdapter(IMessageAdapter adapter)
783783
}
784784

785785
/// <inheritdoc />
786-
void IMessageChannel.SendInMessage(Message message)
786+
bool IMessageChannel.SendInMessage(Message message)
787787
{
788-
OnSendInMessage(message);
788+
return OnSendInMessage(message);
789789
}
790790

791791
private static Tuple<ConnectionStates, Exception> CreateState(ConnectionStates state, Exception error = null)
@@ -802,11 +802,12 @@ private static Tuple<ConnectionStates, Exception> CreateState(ConnectionStates s
802802
/// Send message.
803803
/// </summary>
804804
/// <param name="message">Message.</param>
805-
protected virtual void OnSendInMessage(Message message)
805+
/// <returns><see langword="true"/> if the specified message was processed successfully, otherwise, <see langword="false"/>.</returns>
806+
protected virtual bool OnSendInMessage(Message message)
806807
{
807808
try
808809
{
809-
InternalSendInMessage(message);
810+
return InternalSendInMessage(message);
810811
}
811812
catch (Exception ex)
812813
{
@@ -815,10 +816,12 @@ protected virtual void OnSendInMessage(Message message)
815816
message.HandleErrorResponse(ex, CurrentTime, SendOutMessage, GetSubscribers);
816817

817818
SendOutError(ex);
819+
820+
return false;
818821
}
819822
}
820823

821-
private void InternalSendInMessage(Message message)
824+
private bool InternalSendInMessage(Message message)
822825
{
823826
if (message is ITransactionIdMessage transIdMsg && transIdMsg.TransactionId == 0)
824827
throw new ArgumentException(message.ToString());
@@ -837,7 +840,7 @@ private void InternalSendInMessage(Message message)
837840
else
838841
{
839842
ProcessAdapterMessage(adapter, message);
840-
return;
843+
return true;
841844
}
842845
}
843846

@@ -970,6 +973,8 @@ private void InternalSendInMessage(Message message)
970973
break;
971974
}
972975
}
976+
977+
return true;
973978
}
974979

975980
/// <inheritdoc />

‎Algo/BasketSecurityMessageAdapter.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public BasketSecurityMessageAdapter(ISecurityProvider securityProvider, IBasketS
5252
}
5353

5454
/// <inheritdoc />
55-
protected override void OnSendInMessage(Message message)
55+
protected override bool OnSendInMessage(Message message)
5656
{
5757
switch (message.Type)
5858
{
@@ -131,11 +131,11 @@ protected override void OnSendInMessage(Message message)
131131
OriginalTransactionId = mdMsg.TransactionId
132132
});
133133

134-
return;
134+
return true;
135135
}
136136
}
137137

138-
base.OnSendInMessage(message);
138+
return base.OnSendInMessage(message);
139139
}
140140

141141
/// <inheritdoc />

‎Algo/Candles/Compression/CandleBuilderMessageAdapter.cs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public CandleBuilderMessageAdapter(IMessageAdapter innerAdapter, CandleBuilderPr
7474
}
7575

7676
/// <inheritdoc />
77-
protected override void OnSendInMessage(Message message)
77+
protected override bool OnSendInMessage(Message message)
7878
{
7979
switch (message.Type)
8080
{
@@ -109,7 +109,7 @@ protected override void OnSendInMessage(Message message)
109109
RaiseNewOutMessage(transactionId.CreateNotSupported());
110110
}
111111

112-
return;
112+
return true;
113113
}
114114

115115
if (mdMsg.DataType == MarketDataTypes.CandleTimeFrame)
@@ -148,7 +148,7 @@ protected override void OnSendInMessage(Message message)
148148
{
149149
RaiseNewOutMessage(transactionId.CreateNotSupported());
150150

151-
return;
151+
return true;
152152
}
153153

154154
if (mdMsg.AllowBuildFromSmallerTimeFrame)
@@ -177,8 +177,7 @@ protected override void OnSendInMessage(Message message)
177177
});
178178
}
179179

180-
base.OnSendInMessage(current);
181-
return;
180+
return base.OnSendInMessage(current);
182181
}
183182
}
184183

@@ -215,7 +214,7 @@ protected override void OnSendInMessage(Message message)
215214
}
216215
}
217216

218-
return;
217+
return true;
219218
}
220219
else
221220
{
@@ -237,7 +236,7 @@ protected override void OnSendInMessage(Message message)
237236
}
238237
}
239238

240-
base.OnSendInMessage(message);
239+
return base.OnSendInMessage(message);
241240
}
242241

243242
private SeriesInfo TryGetSeries(long id, out long originalId)

‎Algo/Candles/Compression/CandleHolderMessageAdapter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public CandleHolderMessageAdapter(IMessageAdapter innerAdapter)
2424
}
2525

2626
/// <inheritdoc />
27-
protected override void OnSendInMessage(Message message)
27+
protected override bool OnSendInMessage(Message message)
2828
{
2929
switch (message.Type)
3030
{
@@ -63,7 +63,7 @@ protected override void OnSendInMessage(Message message)
6363
}
6464
}
6565

66-
base.OnSendInMessage(message);
66+
return base.OnSendInMessage(message);
6767
}
6868

6969
/// <inheritdoc />

‎Algo/Commissions/CommissionMessageAdapter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ public ICommissionManager CommissionManager
4545
}
4646

4747
/// <inheritdoc />
48-
protected override void OnSendInMessage(Message message)
48+
protected override bool OnSendInMessage(Message message)
4949
{
5050
CommissionManager.Process(message);
51-
base.OnSendInMessage(message);
51+
return base.OnSendInMessage(message);
5252
}
5353

5454
/// <inheritdoc />

‎Algo/Connector_ProcessMessage.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -521,14 +521,14 @@ private void InnerAdaptersOnCleared()
521521
public StorageMetaInfoMessageAdapter StorageAdapter { get; private set; }
522522

523523
/// <inheritdoc />
524-
public void SendInMessage(Message message)
524+
public bool SendInMessage(Message message)
525525
{
526526
message.TryInitLocalTime(this);
527527

528528
if (!InMessageChannel.IsOpened)
529529
InMessageChannel.Open();
530530

531-
InMessageChannel.SendInMessage(message);
531+
return InMessageChannel.SendInMessage(message);
532532
}
533533

534534
/// <inheritdoc />

‎Algo/FilteredMarketDepthAdapter.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ public FilteredMarketDepthAdapter(IMessageAdapter innerAdapter)
148148
}
149149

150150
/// <inheritdoc />
151-
protected override void OnSendInMessage(Message message)
151+
protected override bool OnSendInMessage(Message message)
152152
{
153153
switch (message.Type)
154154
{
@@ -197,7 +197,7 @@ protected override void OnSendInMessage(Message message)
197197
if (filtered == null)
198198
{
199199
RaiseNewOutMessage(new SubscriptionResponseMessage { OriginalTransactionId = transId });
200-
return;
200+
return true;
201201
}
202202
else
203203
RaiseNewOutMessage(filtered);
@@ -243,14 +243,14 @@ protected override void OnSendInMessage(Message message)
243243
}
244244

245245
RaiseNewOutMessage(reply);
246-
return;
246+
return true;
247247
}
248248

249249
break;
250250
}
251251
}
252252

253-
base.OnSendInMessage(message);
253+
return base.OnSendInMessage(message);
254254
}
255255

256256
/// <inheritdoc />

‎Algo/HeartbeatMessageAdapter.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ protected override void OnInnerAdapterNewOutMessage(Message message)
206206
}
207207

208208
/// <inheritdoc />
209-
protected override void OnSendInMessage(Message message)
209+
protected override bool OnSendInMessage(Message message)
210210
{
211211
var isStartTimer = false;
212212

@@ -276,7 +276,7 @@ protected override void OnSendInMessage(Message message)
276276
lock (_timeSync)
277277
{
278278
if (_currState == ConnectionStates.Disconnecting || _currState == ConnectionStates.Disconnected)
279-
return;
279+
return true;
280280
}
281281
}
282282

@@ -285,20 +285,21 @@ protected override void OnSendInMessage(Message message)
285285

286286
case ExtendedMessageTypes.Reconnect:
287287
{
288-
OnSendInMessage(new ConnectMessage());
289-
return;
288+
return OnSendInMessage(new ConnectMessage());
290289
}
291290
}
292291

293292
try
294293
{
295-
base.OnSendInMessage(message);
294+
var result = base.OnSendInMessage(message);
296295

297296
lock (_timeSync)
298297
{
299298
if (isStartTimer && (_currState == ConnectionStates.Connecting || _currState == ConnectionStates.Connected))
300299
StartTimer();
301300
}
301+
302+
return result;
302303
}
303304
finally
304305
{

‎Algo/Latency/LatencyMessageAdapter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ public ILatencyManager LatencyManager
4545
}
4646

4747
/// <inheritdoc />
48-
protected override void OnSendInMessage(Message message)
48+
protected override bool OnSendInMessage(Message message)
4949
{
5050
message.TryInitLocalTime(this);
5151

5252
LatencyManager.ProcessMessage(message);
5353

54-
base.OnSendInMessage(message);
54+
return base.OnSendInMessage(message);
5555
}
5656

5757
/// <inheritdoc />

‎Algo/LookupTrackingMessageAdapter.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public TimeSpan TimeOut
8080
}
8181

8282
/// <inheritdoc />
83-
protected override void OnSendInMessage(Message message)
83+
protected override bool OnSendInMessage(Message message)
8484
{
8585
switch (message.Type)
8686
{
@@ -98,12 +98,12 @@ protected override void OnSendInMessage(Message message)
9898

9999
default:
100100
if (message.Type.IsLookup() && !ProcessLookupMessage((ISubscriptionMessage)message))
101-
return;
101+
return true;
102102

103103
break;
104104
}
105105

106-
base.OnSendInMessage(message);
106+
return base.OnSendInMessage(message);
107107
}
108108

109109
private bool ProcessLookupMessage(ISubscriptionMessage message)

0 commit comments

Comments
 (0)