Skip to content

Commit 5ff1796

Browse files
committed
Pre-commit
1 parent 1c4cd72 commit 5ff1796

File tree

1 file changed

+63
-57
lines changed

1 file changed

+63
-57
lines changed

mqpy/indicator_connector.py

Lines changed: 63 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -691,15 +691,17 @@ def chaikin_oscillator(
691691
result = data.decode("utf-8")
692692
try:
693693
return json.loads(result)
694-
695694
except ValueError:
696695
logger.exception("Connection lost to MQL5 Service")
697-
698696
except ConnectionResetError:
699-
pass
700-
697+
logger.exception("Connection reset by MQL5 Service")
701698
except ConnectionAbortedError:
702-
pass
699+
logger.exception("Connection aborted by MQL5 Service")
700+
finally:
701+
if "client_socket" in locals():
702+
client_socket.close()
703+
704+
return None
703705

704706
# -------------------------------------------------------------------- #
705707

@@ -749,15 +751,17 @@ def commodity_channel_index(
749751
result = data.decode("utf-8")
750752
try:
751753
return json.loads(result)
752-
753754
except ValueError:
754755
logger.exception("Connection lost to MQL5 Service")
755-
756756
except ConnectionResetError:
757-
pass
758-
757+
logger.exception("Connection reset by MQL5 Service")
759758
except ConnectionAbortedError:
760-
pass
759+
logger.exception("Connection aborted by MQL5 Service")
760+
finally:
761+
if "client_socket" in locals():
762+
client_socket.close()
763+
764+
return None
761765

762766
# -------------------------------------------------------------------- #
763767

@@ -789,15 +793,17 @@ def demarker(
789793
result = data.decode("utf-8")
790794
try:
791795
return json.loads(result)
792-
793796
except ValueError:
794797
logger.exception("Connection lost to MQL5 Service")
795-
796798
except ConnectionResetError:
797-
pass
798-
799+
logger.exception("Connection reset by MQL5 Service")
799800
except ConnectionAbortedError:
800-
pass
801+
logger.exception("Connection aborted by MQL5 Service")
802+
finally:
803+
if "client_socket" in locals():
804+
client_socket.close()
805+
806+
return None
801807

802808
# -------------------------------------------------------------------- #
803809

@@ -851,10 +857,10 @@ def double_exponential_moving_average(
851857
logger.exception("Connection lost to MQL5 Service")
852858

853859
except ConnectionResetError:
854-
pass
860+
logger.exception("Connection reset by MQL5 Service")
855861

856862
except ConnectionAbortedError:
857-
pass
863+
logger.exception("Connection reset by MQL5 Service")
858864

859865
# -------------------------------------------------------------------- #
860866

@@ -920,10 +926,10 @@ def envelopes(
920926
logger.exception("Connection lost to MQL5 Service")
921927

922928
except ConnectionResetError:
923-
pass
929+
logger.exception("Connection reset by MQL5 Service")
924930

925931
except ConnectionAbortedError:
926-
pass
932+
logger.exception("Connection reset by MQL5 Service")
927933

928934
def force_index(
929935
self,
@@ -978,10 +984,10 @@ def force_index(
978984
logger.exception("Connection lost to MQL5 Service")
979985

980986
except ConnectionResetError:
981-
pass
987+
logger.exception("Connection reset by MQL5 Service")
982988

983989
except ConnectionAbortedError:
984-
pass
990+
logger.exception("Connection reset by MQL5 Service")
985991

986992
# -------------------------------------------------------------------- #
987993

@@ -1035,10 +1041,10 @@ def fractal_adaptive_moving_average(
10351041
logger.exception("Connection lost to MQL5 Service")
10361042

10371043
except ConnectionResetError:
1038-
pass
1044+
logger.exception("Connection reset by MQL5 Service")
10391045

10401046
except ConnectionAbortedError:
1041-
pass
1047+
logger.exception("Connection reset by MQL5 Service")
10421048

10431049
# -------------------------------------------------------------------- #
10441050

@@ -1073,10 +1079,10 @@ def fractals(
10731079
logger.exception("Connection lost to MQL5 Service")
10741080

10751081
except ConnectionResetError:
1076-
pass
1082+
logger.exception("Connection reset by MQL5 Service")
10771083

10781084
except ConnectionAbortedError:
1079-
pass
1085+
logger.exception("Connection reset by MQL5 Service")
10801086

10811087
# -------------------------------------------------------------------- #
10821088
# https://www.mql5.com/en/forum/41357
@@ -1153,10 +1159,10 @@ def gator_oscillator(
11531159
logger.exception("Connection lost to MQL5 Service")
11541160

11551161
except ConnectionResetError:
1156-
pass
1162+
logger.exception("Connection reset by MQL5 Service")
11571163

11581164
except ConnectionAbortedError:
1159-
pass
1165+
logger.exception("Connection reset by MQL5 Service")
11601166

11611167
# -------------------------------------------------------------------- #
11621168

@@ -1205,10 +1211,10 @@ def ichimoku_kinko_hyo(
12051211
logger.exception("Connection lost to MQL5 Service")
12061212

12071213
except ConnectionResetError:
1208-
pass
1214+
logger.exception("Connection reset by MQL5 Service")
12091215

12101216
except ConnectionAbortedError:
1211-
pass
1217+
logger.exception("Connection reset by MQL5 Service")
12121218

12131219
# -------------------------------------------------------------------- #
12141220
# Free
@@ -1268,10 +1274,10 @@ def macd(
12681274
logger.exception("Connection lost to MQL5 Service")
12691275

12701276
except ConnectionResetError:
1271-
pass
1277+
logger.exception("Connection reset by MQL5 Service")
12721278

12731279
except ConnectionAbortedError:
1274-
pass
1280+
logger.exception("Connection reset by MQL5 Service")
12751281

12761282
# -------------------------------------------------------------------- #
12771283

@@ -1365,10 +1371,10 @@ def momentum(
13651371
logger.exception("Connection lost to MQL5 Service")
13661372

13671373
except ConnectionResetError:
1368-
pass
1374+
logger.exception("Connection reset by MQL5 Service")
13691375

13701376
except ConnectionAbortedError:
1371-
pass
1377+
logger.exception("Connection reset by MQL5 Service")
13721378

13731379
# -------------------------------------------------------------------- #
13741380

@@ -1482,10 +1488,10 @@ def moving_average(
14821488
logger.exception("Connection lost to MQL5 Service")
14831489

14841490
except ConnectionResetError:
1485-
pass
1491+
logger.exception("Connection reset by MQL5 Service")
14861492

14871493
except ConnectionAbortedError:
1488-
pass
1494+
logger.exception("Connection reset by MQL5 Service")
14891495

14901496
# -------------------------------------------------------------------- #
14911497

@@ -1545,10 +1551,10 @@ def moving_average_of_oscillator(
15451551
logger.exception("Connection lost to MQL5 Service")
15461552

15471553
except ConnectionResetError:
1548-
pass
1554+
logger.exception("Connection reset by MQL5 Service")
15491555

15501556
except ConnectionAbortedError:
1551-
pass
1557+
logger.exception("Connection reset by MQL5 Service")
15521558

15531559
# -------------------------------------------------------------------- #
15541560
# Free
@@ -1588,10 +1594,10 @@ def obv(
15881594
logger.exception("Connection lost to MQL5 Service")
15891595

15901596
except ConnectionResetError:
1591-
pass
1597+
logger.exception("Connection reset by MQL5 Service")
15921598

15931599
except ConnectionAbortedError:
1594-
pass
1600+
logger.exception("Connection reset by MQL5 Service")
15951601

15961602
# -------------------------------------------------------------------- #
15971603

@@ -1630,10 +1636,10 @@ def parabolic_sar(
16301636
logger.exception("Connection lost to MQL5 Service")
16311637

16321638
except ConnectionResetError:
1633-
pass
1639+
logger.exception("Connection reset by MQL5 Service")
16341640

16351641
except ConnectionAbortedError:
1636-
pass
1642+
logger.exception("Connection reset by MQL5 Service")
16371643

16381644
# -------------------------------------------------------------------- #
16391645

@@ -1687,10 +1693,10 @@ def relative_strength_index(
16871693
logger.exception("Connection lost to MQL5 Service")
16881694

16891695
except ConnectionResetError:
1690-
pass
1696+
logger.exception("Connection reset by MQL5 Service")
16911697

16921698
except ConnectionAbortedError:
1693-
pass
1699+
logger.exception("Connection reset by MQL5 Service")
16941700

16951701
# -------------------------------------------------------------------- #
16961702

@@ -1727,10 +1733,10 @@ def relative_vigor_index(
17271733
logger.exception("Connection lost to MQL5 Service")
17281734

17291735
except ConnectionResetError:
1730-
pass
1736+
logger.exception("Connection reset by MQL5 Service")
17311737

17321738
except ConnectionAbortedError:
1733-
pass
1739+
logger.exception("Connection reset by MQL5 Service")
17341740

17351741
# -------------------------------------------------------------------- #
17361742

@@ -1792,10 +1798,10 @@ def standard_deviation(
17921798
logger.exception("Connection lost to MQL5 Service")
17931799

17941800
except ConnectionResetError:
1795-
pass
1801+
logger.exception("Connection reset by MQL5 Service")
17961802

17971803
except ConnectionAbortedError:
1798-
pass
1804+
logger.exception("Connection reset by MQL5 Service")
17991805

18001806
# -------------------------------------------------------------------- #
18011807
# Free
@@ -1858,10 +1864,10 @@ def stochastic(
18581864
logger.exception("Connection lost to MQL5 Service")
18591865

18601866
except ConnectionResetError:
1861-
pass
1867+
logger.exception("Connection reset by MQL5 Service")
18621868

18631869
except ConnectionAbortedError:
1864-
pass
1870+
logger.exception("Connection reset by MQL5 Service")
18651871

18661872
# -------------------------------------------------------------------- #
18671873

@@ -1962,10 +1968,10 @@ def triple_exponential_moving_average(
19621968
logger.exception("Connection lost to MQL5 Service")
19631969

19641970
except ConnectionResetError:
1965-
pass
1971+
logger.exception("Connection reset by MQL5 Service")
19661972

19671973
except ConnectionAbortedError:
1968-
pass
1974+
logger.exception("Connection reset by MQL5 Service")
19691975

19701976
# -------------------------------------------------------------------- #
19711977

@@ -2022,10 +2028,10 @@ def variable_index_dynamic_average(
20222028
logger.exception("Connection lost to MQL5 Service")
20232029

20242030
except ConnectionResetError:
2025-
pass
2031+
logger.exception("Connection reset by MQL5 Service")
20262032

20272033
except ConnectionAbortedError:
2028-
pass
2034+
logger.exception("Connection reset by MQL5 Service")
20292035

20302036
# -------------------------------------------------------------------- #
20312037

@@ -2065,10 +2071,10 @@ def volumes(
20652071
logger.exception("Connection lost to MQL5 Service")
20662072

20672073
except ConnectionResetError:
2068-
pass
2074+
logger.exception("Connection reset by MQL5 Service")
20692075

20702076
except ConnectionAbortedError:
2071-
pass
2077+
logger.exception("Connection reset by MQL5 Service")
20722078

20732079
# -------------------------------------------------------------------- #
20742080

@@ -2105,7 +2111,7 @@ def williams_percent_range(
21052111
logger.exception("Connection lost to MQL5 Service")
21062112

21072113
except ConnectionResetError:
2108-
pass
2114+
logger.exception("Connection reset by MQL5 Service")
21092115

21102116
except ConnectionAbortedError:
2111-
pass
2117+
logger.exception("Connection reset by MQL5 Service")

0 commit comments

Comments
 (0)