 hxy7yx
|
4766081eb7
|
resolve merge conflicts
|
2023-10-11 10:40:00 +08:00 |
|
|
hxy7yx
|
8c78faafe8
|
Switch the log level to debug/notice and no longer automatically switch back
|
2023-10-08 10:13:11 +08:00 |
|
|
fengzeroz
|
6ece977535
|
Merge pull request #1567 from fengzeroz/v2.6
core: using lo udp replace nng pair1
|
2023-10-08 09:19:49 +08:00 |
|
|
fengzero
|
f73280dd04
|
feat(core): trans_data msg are sent using a separate channel
|
2023-10-07 09:05:40 +00:00 |
|
|
fengzero
|
63854443be
|
fix(connection): server consume
|
2023-09-28 07:46:09 +00:00 |
|
|
fengzero
|
e1a751614f
|
core: using lo udp replace pair1
|
2023-09-28 07:23:41 +00:00 |
|
|
fengzero
|
175f23ad21
|
Revert "core: using nng_send_aio"
This reverts commit c7aaf234feebf0a5f69ede76953cb4be1630ea19.
|
2023-09-28 07:23:41 +00:00 |
|
|
fengzero
|
f27b7b9da6
|
core: using nng_send_aio
|
2023-09-28 07:23:41 +00:00 |
|
|
fengzeroz
|
9f4b04a021
|
Merge pull request #1569 from eeff/v2.6
Pick to v2.6 fix: guard against empty mqtt subscription topic
|
2023-09-28 15:23:31 +08:00 |
|
|
eeff
|
5fb50e1d84
|
test: add ft test case for empty mqtt subscription topic
|
2023-09-28 15:10:50 +08:00 |
|
|
eeff
|
37fa663f7c
|
fix: guard against empty mqtt subscription topic
|
2023-09-28 15:10:50 +08:00 |
|
|
fengzeroz
|
2693e59508
|
Merge pull request #1565 from fengzeroz/v2.6
Revert "adapter/manager recv list timeout"
|
2023-09-26 13:45:43 +08:00 |
|
|
fengzero
|
fa219c1850
|
Revert "adapter/manager recv list timeout"
This reverts commit b7bafef1e0.
|
2023-09-26 05:45:18 +00:00 |
|
|
fengzeroz
|
35f2a1e28b
|
Merge pull request #1563 from fengzeroz/v2.6
adapter/manager recv list timeout
|
2023-09-25 16:50:39 +08:00 |
|
|
fengzero
|
b7bafef1e0
|
adapter/manager recv list timeout
|
2023-09-25 08:39:57 +00:00 |
|
|
fengzeroz
|
717cfcb756
|
Merge pull request #1559 from fengzeroz/v2.6
fix(event): lock event loop
|
2023-09-22 18:12:08 +08:00 |
|
|
fengzero
|
1ed77c631a
|
fix(timer): stop after callback done
|
2023-09-22 09:56:12 +00:00 |
|
|
fengzeroz
|
041b7423c8
|
Merge pull request #1555 from eeff/v2.6
Pick to v2.6 feat(monitor): move metrics api to restful plugin and remove singleton property
|
2023-09-22 17:54:25 +08:00 |
|
|
fengzero
|
53089af902
|
fix(event): lock event loop
|
2023-09-22 09:28:05 +00:00 |
|
|
fengzeroz
|
ce747b57d4
|
Merge pull request #1556 from fengzeroz/v2.6
fix(connection): compile warning
|
2023-09-22 13:55:28 +08:00 |
|
|
fengzero
|
e6674f1eef
|
fix(connection): compile warning
|
2023-09-22 05:53:19 +00:00 |
|
|
fengzeroz
|
a352e75863
|
Merge pull request #1554 from fengzeroz/v2.6
fix(timer): use after free
|
2023-09-22 11:43:48 +08:00 |
|
|
fengzero
|
d16051a3c7
|
fix(timer): use after free
|
2023-09-22 03:36:30 +00:00 |
|
|
eeff
|
78cd5f5105
|
ci: run pyft depending on branch
|
2023-09-22 10:52:40 +08:00 |
|
|
eeff
|
b87da6154c
|
test: remove update node name test for monitor
|
2023-09-22 10:52:40 +08:00 |
|
|
eeff
|
e8dffb1ee2
|
feat(monitor): make as non-singleton plugin
|
2023-09-22 10:52:40 +08:00 |
|
|
eeff
|
812cc72a6c
|
feat(monitor): remove metrics http api
|
2023-09-22 10:52:40 +08:00 |
|
|
eeff
|
e201ba6a3e
|
feat(restful): add metrics api
|
2023-09-22 10:52:40 +08:00 |
|
|
fengzeroz
|
507842b8a2
|
Merge pull request #1524 from hxy7yx/v2.6-1
core&modbus support ipv6
|
2023-09-21 19:42:01 +08:00 |
|
|
fengzeroz
|
3fc48541c7
|
Merge pull request #1550 from fengzeroz/v2.6
ci: create and update daily
|
2023-09-21 16:38:19 +08:00 |
|
|
fengzero
|
834ab49ebf
|
ci: create and update daily
|
2023-09-21 08:34:35 +00:00 |
|
|
hxy7yx
|
2470e915fb
|
core&modbus support ipv6
|
2023-09-21 15:50:41 +08:00 |
|
|
fengzeroz
|
219db4f571
|
Merge pull request #1546 from eeff/v2.6
Pick to v2.6 chore: remove compiler warning
|
2023-09-21 10:54:06 +08:00 |
|
|
eeff
|
2163a6aabe
|
chore: remove compiler warning
|
2023-09-21 10:51:06 +08:00 |
|
|
fengzeroz
|
48b2e29434
|
Merge pull request #1544 from hxy7yx/v2.6-3
fix(modbus):rtu server recv&send
|
2023-09-21 10:46:36 +08:00 |
|
|
hxy7yx
|
93c2c09049
|
fix(modbus):rtu server recv&send
|
2023-09-21 09:58:48 +08:00 |
|
|
fengzeroz
|
d2701f1772
|
Merge pull request #1541 from fengzeroz/v2.6
start report after read timer
|
2023-09-19 16:42:35 +08:00 |
|
|
fengzero
|
4e44ff19e4
|
start report after read timer
|
2023-09-19 08:41:29 +00:00 |
|
|
fengzeroz
|
68bd9245b8
|
Merge pull request #1540 from fengzeroz/v2.6
log millisecond
|
2023-09-19 15:20:09 +08:00 |
|
|
fengzero
|
bf3276a857
|
log millisecond
|
2023-09-19 07:13:48 +00:00 |
|
|
fengzeroz
|
b8b4dc55fd
|
Merge pull request #1538 from fengzeroz/v2.6
version: 2.6.0
2.6.0
|
2023-09-15 18:11:47 +08:00 |
|
|
fengzero
|
65a5c9e0c5
|
version: 2.6.0
|
2023-09-15 10:11:17 +00:00 |
|
|
fengzeroz
|
d165a0caf1
|
Merge pull request #1537 from eeff/v2.6
Pick to v2.6 fix(monitor): group update json event encoding
|
2023-09-15 09:28:51 +08:00 |
|
|
eeff
|
d251eb9409
|
fix(monitor): group update json event encoding
|
2023-09-14 18:10:42 +08:00 |
|
|
fengzeroz
|
428f65a53e
|
Merge pull request #1535 from fengzeroz/v2.6
fix(driver): validate tag when loading tags
|
2023-09-14 14:50:08 +08:00 |
|
|
fengzero
|
e68d469e3d
|
fix(driver): validate tag when loading tags
|
2023-09-14 06:40:04 +00:00 |
|
|
fengzeroz
|
f2026ac304
|
Merge pull request #1532 from fengzeroz/v2.6
fix(event): check io is null
|
2023-09-14 11:33:56 +08:00 |
|
|
fengzero
|
e427211c63
|
fix(event): check io is null
|
2023-09-14 03:16:18 +00:00 |
|
|
fengzeroz
|
09adbcdd4d
|
Merge pull request #1527 from eeff/v2.6
Pick to v2.6 fix: zero out trailing hash key string
|
2023-09-13 10:57:56 +08:00 |
|
|
eeff
|
bb77c59e2b
|
fix: zero out trailing hash key string
|
2023-09-13 10:48:09 +08:00 |
|