ominfra 0.0.0.dev144__py3-none-any.whl → 0.0.0.dev145__py3-none-any.whl
Sign up to get free protection for your applications and to get access to all the features.
- ominfra/manage/commands/execution.py +1 -1
- ominfra/manage/commands/inject.py +2 -3
- ominfra/manage/deploy/paths.py +33 -0
- ominfra/manage/main.py +2 -1
- ominfra/manage/remote/execution.py +2 -1
- ominfra/scripts/journald2aws.py +73 -53
- ominfra/scripts/manage.py +77 -58
- ominfra/scripts/supervisor.py +114 -94
- ominfra/supervisor/dispatchers.py +3 -3
- ominfra/supervisor/http.py +6 -6
- ominfra/supervisor/inject.py +12 -12
- ominfra/supervisor/io.py +2 -2
- ominfra/supervisor/spawningimpl.py +2 -2
- ominfra/supervisor/supervisor.py +2 -2
- ominfra/supervisor/types.py +2 -2
- {ominfra-0.0.0.dev144.dist-info → ominfra-0.0.0.dev145.dist-info}/METADATA +3 -3
- {ominfra-0.0.0.dev144.dist-info → ominfra-0.0.0.dev145.dist-info}/RECORD +21 -20
- {ominfra-0.0.0.dev144.dist-info → ominfra-0.0.0.dev145.dist-info}/LICENSE +0 -0
- {ominfra-0.0.0.dev144.dist-info → ominfra-0.0.0.dev145.dist-info}/WHEEL +0 -0
- {ominfra-0.0.0.dev144.dist-info → ominfra-0.0.0.dev145.dist-info}/entry_points.txt +0 -0
- {ominfra-0.0.0.dev144.dist-info → ominfra-0.0.0.dev145.dist-info}/top_level.txt +0 -0
@@ -7,7 +7,7 @@ import typing as ta
|
|
7
7
|
|
8
8
|
from omlish.lite.check import check_isinstance
|
9
9
|
from omlish.lite.check import check_not_none
|
10
|
-
from omlish.lite.fdio.handlers import
|
10
|
+
from omlish.lite.fdio.handlers import FdioHandler
|
11
11
|
from omlish.lite.typing import Func3
|
12
12
|
|
13
13
|
from .configs import ProcessConfig
|
@@ -200,7 +200,7 @@ class ProcessSpawningImpl(ProcessSpawning):
|
|
200
200
|
return exe, args
|
201
201
|
|
202
202
|
def _make_dispatchers(self, pipes: ProcessPipes) -> Dispatchers:
|
203
|
-
dispatchers: ta.List[
|
203
|
+
dispatchers: ta.List[FdioHandler] = []
|
204
204
|
|
205
205
|
if pipes.stdout is not None:
|
206
206
|
dispatchers.append(check_isinstance(self._output_dispatcher_factory(
|
ominfra/supervisor/supervisor.py
CHANGED
@@ -5,7 +5,7 @@ import time
|
|
5
5
|
import typing as ta
|
6
6
|
|
7
7
|
from omlish.lite.check import check_isinstance
|
8
|
-
from omlish.lite.fdio.pollers import
|
8
|
+
from omlish.lite.fdio.pollers import FdioPoller
|
9
9
|
from omlish.lite.logs import log
|
10
10
|
from omlish.lite.typing import Func1
|
11
11
|
|
@@ -66,7 +66,7 @@ class Supervisor:
|
|
66
66
|
self,
|
67
67
|
*,
|
68
68
|
config: ServerConfig,
|
69
|
-
poller:
|
69
|
+
poller: FdioPoller,
|
70
70
|
process_groups: ProcessGroupManager,
|
71
71
|
signal_handler: SignalHandler,
|
72
72
|
event_callbacks: EventCallbacks,
|
ominfra/supervisor/types.py
CHANGED
@@ -3,7 +3,7 @@ import abc
|
|
3
3
|
import functools
|
4
4
|
import typing as ta
|
5
5
|
|
6
|
-
from omlish.lite.fdio.handlers import
|
6
|
+
from omlish.lite.fdio.handlers import FdioHandler
|
7
7
|
|
8
8
|
from .configs import ProcessConfig
|
9
9
|
from .configs import ProcessGroupConfig
|
@@ -69,7 +69,7 @@ class HasDispatchers(abc.ABC):
|
|
69
69
|
raise NotImplementedError
|
70
70
|
|
71
71
|
|
72
|
-
class ProcessDispatcher(
|
72
|
+
class ProcessDispatcher(FdioHandler, abc.ABC):
|
73
73
|
@property
|
74
74
|
@abc.abstractmethod
|
75
75
|
def channel(self) -> ProcessOutputChannel:
|
@@ -1,6 +1,6 @@
|
|
1
1
|
Metadata-Version: 2.1
|
2
2
|
Name: ominfra
|
3
|
-
Version: 0.0.0.
|
3
|
+
Version: 0.0.0.dev145
|
4
4
|
Summary: ominfra
|
5
5
|
Author: wrmsr
|
6
6
|
License: BSD-3-Clause
|
@@ -12,8 +12,8 @@ Classifier: Operating System :: OS Independent
|
|
12
12
|
Classifier: Operating System :: POSIX
|
13
13
|
Requires-Python: >=3.12
|
14
14
|
License-File: LICENSE
|
15
|
-
Requires-Dist: omdev==0.0.0.
|
16
|
-
Requires-Dist: omlish==0.0.0.
|
15
|
+
Requires-Dist: omdev==0.0.0.dev145
|
16
|
+
Requires-Dist: omlish==0.0.0.dev145
|
17
17
|
Provides-Extra: all
|
18
18
|
Requires-Dist: paramiko~=3.5; extra == "all"
|
19
19
|
Requires-Dist: asyncssh~=2.18; extra == "all"
|
@@ -33,41 +33,42 @@ ominfra/manage/bootstrap.py,sha256=puGpmK6b6ZCAX5E_HI9ucUuWlXB4U_4Xwc2x8GAKSVo,2
|
|
33
33
|
ominfra/manage/bootstrap_.py,sha256=WVry3P5ViPpdEC_-EFBouZTECMxs4CwRbek4Oz_iRbc,517
|
34
34
|
ominfra/manage/config.py,sha256=1y2N_8nXHBZc6YbW6BaRZoDDCTBmiHuWtTOQ7zdr5VE,184
|
35
35
|
ominfra/manage/inject.py,sha256=jGjGqlecpxzpJR3-RqQhEBOmpsix5UwSsvrz5DbayC4,1395
|
36
|
-
ominfra/manage/main.py,sha256=
|
36
|
+
ominfra/manage/main.py,sha256=cxhjlA5-rORqyndkMwblKbcit0_bahOkq5Ix068h9ao,2967
|
37
37
|
ominfra/manage/marshal.py,sha256=WKj7IU9bo4fBMSSzT6ZMm_WFalXIJZ-V7j8oi92fNhk,305
|
38
38
|
ominfra/manage/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
39
39
|
ominfra/manage/commands/base.py,sha256=yhOAh893iJrk0SvgkRZQMLw8cvStEI2IaHKP9Ifg7N0,3966
|
40
|
-
ominfra/manage/commands/execution.py,sha256=
|
41
|
-
ominfra/manage/commands/inject.py,sha256=
|
40
|
+
ominfra/manage/commands/execution.py,sha256=F5SUv3SYFwpnDKaBDgSmXLtk7qDSrN7zT0Ri-j1fTNQ,606
|
41
|
+
ominfra/manage/commands/inject.py,sha256=Xqb1iifmjgIXwttHAhoYbPB8yvuIH86W-GxwKnRdt0I,3366
|
42
42
|
ominfra/manage/commands/marshal.py,sha256=4DSCMPzRiRhufIB_9DPL6LrZkRZOle5ruOWU4MVlcXM,694
|
43
43
|
ominfra/manage/commands/subprocess.py,sha256=3JaOt56uPqW3jYRtpBpHk5zm3ZzOXzCK-feyDBkq8P4,2198
|
44
44
|
ominfra/manage/deploy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
45
45
|
ominfra/manage/deploy/command.py,sha256=mTBjerB7lIBdPrivgyWkoAYDY76cfHexjEFYTzanURY,493
|
46
46
|
ominfra/manage/deploy/inject.py,sha256=j5LYK5y_nZgdaNLde8sV2w_---GvmibgO_ZBT8qzeFM,499
|
47
|
+
ominfra/manage/deploy/paths.py,sha256=0P1c6rC5_OyZK9fmSKNWedcTJPJdu-eJUeCEeZ13NTc,410
|
47
48
|
ominfra/manage/remote/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
48
49
|
ominfra/manage/remote/channel.py,sha256=l3bsuE6JZ3VD5abxsWys7m-4kFjOr_B-27bEMgz4K4Q,1325
|
49
50
|
ominfra/manage/remote/config.py,sha256=yMJsz8zB5i3ytiS-YaCb6-qXumMKXh18SjmtzPVO44c,280
|
50
|
-
ominfra/manage/remote/execution.py,sha256=
|
51
|
+
ominfra/manage/remote/execution.py,sha256=Naag81xRZcUIn8fFdcswiS0MarX_jOksCDaS6emDdw0,4879
|
51
52
|
ominfra/manage/remote/inject.py,sha256=0TEODiCirwlApejbAR7-0ZGkNXA99IHZdmAFKliyJYw,783
|
52
53
|
ominfra/manage/remote/payload.py,sha256=Rn-Yo26POpHEOOfUHX3jWkqcQVEAvkJ_5Bu13jwoob4,944
|
53
54
|
ominfra/manage/remote/spawning.py,sha256=6JLs_IsMjNQr6i8vROUjHsqmNFno1Ykh3oBXOOHBFYY,2614
|
54
55
|
ominfra/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
55
|
-
ominfra/scripts/journald2aws.py,sha256=
|
56
|
-
ominfra/scripts/manage.py,sha256=
|
57
|
-
ominfra/scripts/supervisor.py,sha256=
|
56
|
+
ominfra/scripts/journald2aws.py,sha256=7Ic0XYVJYqfqd8JYZB8HlNRMPqt6A1lV1XWMeHqWSaQ,136036
|
57
|
+
ominfra/scripts/manage.py,sha256=b_XfogUiUIQQU1ud5iAvZI5srq_i4rmSJz5X4FdEzGk,93445
|
58
|
+
ominfra/scripts/supervisor.py,sha256=DZ3V4UI9xAz1tGRrAa-tXNnlr0YqpmRDg8XRvB1r-AE,250082
|
58
59
|
ominfra/supervisor/LICENSE.txt,sha256=yvqaMNsDhWxziHa9ien6qCW1SkZv-DQlAg96XjfSee8,1746
|
59
60
|
ominfra/supervisor/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
|
60
61
|
ominfra/supervisor/__main__.py,sha256=I0yFw-C08OOiZ3BF6lF1Oiv789EQXu-_j6whDhQUTEA,66
|
61
62
|
ominfra/supervisor/configs.py,sha256=OPtiL5_SjBYQ9xDqMgZvjoXgpleTxv4d3C4fD1X2Dz0,3966
|
62
|
-
ominfra/supervisor/dispatchers.py,sha256=
|
63
|
+
ominfra/supervisor/dispatchers.py,sha256=pPy94u8IoDDKD0bDi6I1wdkO-HmJYtv5iudppraFZAM,1007
|
63
64
|
ominfra/supervisor/dispatchersimpl.py,sha256=q3dEyOHWTPKm28nmAGisjgIW1BX6O3-SzbYa7nWuTEs,11349
|
64
65
|
ominfra/supervisor/events.py,sha256=XGrtzHr1xm0dwjz329fn9eR0_Ap-LQL6Sk8LJ8eVDEo,6692
|
65
66
|
ominfra/supervisor/exceptions.py,sha256=Qbu211H3CLlSmi9LsSikOwrcL5HgJP9ugvcKWlGTAoI,750
|
66
67
|
ominfra/supervisor/groups.py,sha256=MBbsbt8Zh_WEYkGOr1KXa82gnPVw9wPB2lAnqhugXSc,2457
|
67
68
|
ominfra/supervisor/groupsimpl.py,sha256=nIrW4SmB0W6c2jOR_HhkfVcH4eHyLZnG1FJ0MCzc6mQ,2292
|
68
|
-
ominfra/supervisor/http.py,sha256=
|
69
|
-
ominfra/supervisor/inject.py,sha256=
|
70
|
-
ominfra/supervisor/io.py,sha256=
|
69
|
+
ominfra/supervisor/http.py,sha256=gKQBKOzscr4x0q6k7fVbUEoxikk82JOZur18FhYkSVA,3473
|
70
|
+
ominfra/supervisor/inject.py,sha256=LRIEUYYwjd-4LKQJQocJv2VmPuYt_IHvIz7TlMtbcRk,4701
|
71
|
+
ominfra/supervisor/io.py,sha256=Ajdu6e_wDZB-k35iDPZAThMFEVUxodmsQVkQVf36we4,3200
|
71
72
|
ominfra/supervisor/main.py,sha256=oqaWOcnHJgaxNhjyphPgjaNjHPjDcx7kzYMjtZpwSxE,4253
|
72
73
|
ominfra/supervisor/pipes.py,sha256=2ZihNTnRNjnIPOtPbm3_pyqO15f7BNs7WnNtO5V8ahM,2231
|
73
74
|
ominfra/supervisor/privileges.py,sha256=kaRTHI7XjqzxEWCeHp3_0J0Vc4gSPugRbXEwxuw6MYE,2054
|
@@ -77,10 +78,10 @@ ominfra/supervisor/setup.py,sha256=7HwwwI-WT_Z0WjZ9_l5Orr4K298nKKhQ1f_ZgGsi9TU,6
|
|
77
78
|
ominfra/supervisor/setupimpl.py,sha256=88h3oYsdJ0LAo7sZZZGRQti14oQay3b-0Vd_h3Cl108,9638
|
78
79
|
ominfra/supervisor/signals.py,sha256=jY52naUifcAjd6nICTP1ZW3IQSPsHB4cvbsJo8_QV_U,2196
|
79
80
|
ominfra/supervisor/spawning.py,sha256=i1k3tmqWyU-KIN7kel-JVxTVGnLiTIVmZzlstJSZpjM,622
|
80
|
-
ominfra/supervisor/spawningimpl.py,sha256=
|
81
|
+
ominfra/supervisor/spawningimpl.py,sha256=9WcbxmJmWBEAqUlbMQntre4rUi1FcXE9pj5q0FoCeeY,11162
|
81
82
|
ominfra/supervisor/states.py,sha256=x1trJQbItkSegOmotpn5YNcZMLbBL8I3GmhvFCQl4Oo,1400
|
82
|
-
ominfra/supervisor/supervisor.py,sha256=
|
83
|
-
ominfra/supervisor/types.py,sha256=
|
83
|
+
ominfra/supervisor/supervisor.py,sha256=QlF8RNl-9I5fVvK9pTxuD4S7aDWJBIyXOMydnRrf3E4,9342
|
84
|
+
ominfra/supervisor/types.py,sha256=Ivzzyh4psndtrOlWx4eAocUHpiUPAgyv7mDc0GQvuuQ,4017
|
84
85
|
ominfra/supervisor/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
85
86
|
ominfra/supervisor/utils/collections.py,sha256=vcfmVYS4QngMdtEI1DvdRIcubmy55Wj40NCzW27_rIY,1361
|
86
87
|
ominfra/supervisor/utils/diag.py,sha256=ujz4gkW7p3wmbaKFM8Hz5eHEwpoUkbB8JeDvcHilCz0,705
|
@@ -96,9 +97,9 @@ ominfra/tailscale/api.py,sha256=C5-t_b6jZXUWcy5k8bXm7CFnk73pSdrlMOgGDeGVrpw,1370
|
|
96
97
|
ominfra/tailscale/cli.py,sha256=DSGp4hn5xwOW-l_u_InKlSF6kIobxtUtVssf_73STs0,3567
|
97
98
|
ominfra/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
98
99
|
ominfra/tools/listresources.py,sha256=4qVg5txsb10EHhvqXXeM6gJ2jx9LbroEnPydDv1uXs0,6176
|
99
|
-
ominfra-0.0.0.
|
100
|
-
ominfra-0.0.0.
|
101
|
-
ominfra-0.0.0.
|
102
|
-
ominfra-0.0.0.
|
103
|
-
ominfra-0.0.0.
|
104
|
-
ominfra-0.0.0.
|
100
|
+
ominfra-0.0.0.dev145.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
|
101
|
+
ominfra-0.0.0.dev145.dist-info/METADATA,sha256=WWUYA_l7PWNOV2TZLuNB2NCMC9gU9NmpmS_ewXOu9og,731
|
102
|
+
ominfra-0.0.0.dev145.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
|
103
|
+
ominfra-0.0.0.dev145.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
|
104
|
+
ominfra-0.0.0.dev145.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
|
105
|
+
ominfra-0.0.0.dev145.dist-info/RECORD,,
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|