From: michael.opdenacker@bootlin.com
To: bitbake-devel@lists.openembedded.org
Cc: Michael Opdenacker <michael.opdenacker@bootlin.com>,
Joshua Watt <JPEWhacker@gmail.com>,
Tim Orling <ticotimo@gmail.com>
Subject: [PATCH 05/12] asyncrpc: include parse_address from hashserv
Date: Fri, 29 Mar 2024 15:39:49 +0100 [thread overview]
Message-ID: <20240329143956.1602707-6-michael.opdenacker@bootlin.com> (raw)
In-Reply-To: <20240329143956.1602707-1-michael.opdenacker@bootlin.com>
From: Michael Opdenacker <michael.opdenacker@bootlin.com>
Moving the code and related definitions from
hashserv/__init__.py to asyncrpc/client.py,
allowing this function to be used in other asyncrpc clients.
Signed-off-by: Michael Opdenacker <michael.opdenacker@bootlin.com>
Suggested-by: Joshua Watt <JPEWhacker@gmail.com>
Cc: Tim Orling <ticotimo@gmail.com>
---
lib/bb/asyncrpc/client.py | 23 +++++++++++++++++++++++
lib/hashserv/__init__.py | 27 +--------------------------
2 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/lib/bb/asyncrpc/client.py b/lib/bb/asyncrpc/client.py
index 29a5ab76aa..a350b4fb12 100644
--- a/lib/bb/asyncrpc/client.py
+++ b/lib/bb/asyncrpc/client.py
@@ -10,11 +10,34 @@ import json
import os
import socket
import sys
+import re
import contextlib
from threading import Thread
from .connection import StreamConnection, WebsocketConnection, DEFAULT_MAX_CHUNK
from .exceptions import ConnectionClosedError, InvokeError
+UNIX_PREFIX = "unix://"
+WS_PREFIX = "ws://"
+WSS_PREFIX = "wss://"
+
+ADDR_TYPE_UNIX = 0
+ADDR_TYPE_TCP = 1
+ADDR_TYPE_WS = 2
+
+def parse_address(addr):
+ if addr.startswith(UNIX_PREFIX):
+ return (ADDR_TYPE_UNIX, (addr[len(UNIX_PREFIX) :],))
+ elif addr.startswith(WS_PREFIX) or addr.startswith(WSS_PREFIX):
+ return (ADDR_TYPE_WS, (addr,))
+ else:
+ m = re.match(r"\[(?P<host>[^\]]*)\]:(?P<port>\d+)$", addr)
+ if m is not None:
+ host = m.group("host")
+ port = m.group("port")
+ else:
+ host, port = addr.split(":")
+
+ return (ADDR_TYPE_TCP, (host, int(port)))
class AsyncClient(object):
def __init__(
diff --git a/lib/hashserv/__init__.py b/lib/hashserv/__init__.py
index 552a33278f..74367eb6b4 100644
--- a/lib/hashserv/__init__.py
+++ b/lib/hashserv/__init__.py
@@ -5,39 +5,14 @@
import asyncio
from contextlib import closing
-import re
import itertools
import json
from collections import namedtuple
from urllib.parse import urlparse
-
-UNIX_PREFIX = "unix://"
-WS_PREFIX = "ws://"
-WSS_PREFIX = "wss://"
-
-ADDR_TYPE_UNIX = 0
-ADDR_TYPE_TCP = 1
-ADDR_TYPE_WS = 2
+from bb.asyncrpc.client import parse_address, ADDR_TYPE_UNIX, ADDR_TYPE_WS
User = namedtuple("User", ("username", "permissions"))
-
-def parse_address(addr):
- if addr.startswith(UNIX_PREFIX):
- return (ADDR_TYPE_UNIX, (addr[len(UNIX_PREFIX) :],))
- elif addr.startswith(WS_PREFIX) or addr.startswith(WSS_PREFIX):
- return (ADDR_TYPE_WS, (addr,))
- else:
- m = re.match(r"\[(?P<host>[^\]]*)\]:(?P<port>\d+)$", addr)
- if m is not None:
- host = m.group("host")
- port = m.group("port")
- else:
- host, port = addr.split(":")
-
- return (ADDR_TYPE_TCP, (host, int(port)))
-
-
def create_server(
addr,
dbname,
--
2.34.1
next prev parent reply other threads:[~2024-03-29 14:40 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-29 14:39 [PATCH 00/12] prserv: add support for an "upstream" server michael.opdenacker
2024-03-29 14:39 ` [PATCH 01/12] prserv: simplify the PRServerClient() interface michael.opdenacker
2024-03-29 14:39 ` [PATCH 02/12] prserv: use double quotes by default michael.opdenacker
2024-03-29 14:39 ` [PATCH 03/12] bitbake-prserv: replace deprecated optparse by argparse michael.opdenacker
2024-03-29 14:39 ` [PATCH 04/12] prserv: use self.logger instead of logger directly michael.opdenacker
2024-03-29 14:39 ` michael.opdenacker [this message]
2024-03-29 14:39 ` [PATCH 06/12] prserv: capitalization and spacing improvements michael.opdenacker
2024-03-29 14:39 ` [PATCH 07/12] prserv: fix read_only test michael.opdenacker
2024-04-03 15:42 ` [bitbake-devel] " Richard Purdie
2024-04-03 16:19 ` Michael Opdenacker
[not found] ` <17C2CF7EC9CE2E93.4513@lists.openembedded.org>
2024-04-03 20:32 ` Richard Purdie
2024-03-29 14:39 ` [PATCH 08/12] prserv: add extra requests michael.opdenacker
2024-03-29 14:39 ` [PATCH 09/12] prserv: remove redundant exception handler michael.opdenacker
2024-03-29 14:39 ` [PATCH 10/12] prserv: correct error message michael.opdenacker
2024-03-29 14:39 ` [PATCH 11/12] prserv: remove unnecessary code michael.opdenacker
2024-03-29 14:39 ` [PATCH 12/12] prserv: add "upstream" server support michael.opdenacker
2024-04-03 15:09 ` [bitbake-devel] [PATCH 00/12] prserv: add support for an "upstream" server Richard Purdie
2024-04-03 15:33 ` Michael Opdenacker
2024-04-03 15:54 ` Richard Purdie
2024-04-12 9:02 michael.opdenacker
2024-04-12 9:02 ` [PATCH 05/12] asyncrpc: include parse_address from hashserv michael.opdenacker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240329143956.1602707-6-michael.opdenacker@bootlin.com \
--to=michael.opdenacker@bootlin.com \
--cc=JPEWhacker@gmail.com \
--cc=bitbake-devel@lists.openembedded.org \
--cc=ticotimo@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.