Skip to content

Allow passing cf client config #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jacomago wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Allow passing cf client config #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion server/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ classifiers = [
"Programming Language :: Python :: 3.14",
]
dependencies = [
"channelfinder @ https://github.com/ChannelFinder/pyCFClient/archive/refs/tags/v3.0.0.zip",
"channelfinder @ https://github.com/ChannelFinder/pyCFClient/archive/refs/tags/v3.2.0.zip",
"dataclasses; python_version<'3.7'",
"requests",
"twisted",
Expand Down
15 changes: 14 additions & 1 deletion server/recceiver/cfstore.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ class CFConfig:
recceiver_id: str = RECCEIVERID_DEFAULT
timezone: Optional[str] = None
cf_query_limit: int = DEFAULT_QUERY_LIMIT
base_url: Optional[str] = None
cf_username: Optional[str] = None
cf_password: Optional[str] = None
verify_ssl: Optional[bool] = None

@classmethod
def loads(cls, conf: ConfigAdapter) -> "CFConfig":
Expand All @@ -75,6 +79,10 @@ def loads(cls, conf: ConfigAdapter) -> "CFConfig":
recceiver_id=conf.get("recceiverId", RECCEIVERID_DEFAULT),
timezone=conf.get("timezone", ""),
cf_query_limit=conf.get("findSizeLimit", DEFAULT_QUERY_LIMIT),
base_url=conf.get("baseUrl"),
cf_username=conf.get("cfUsername"),
cf_password=conf.get("cfPassword"),
verify_ssl=conf.get("verifySSL"),
)


Expand Down Expand Up @@ -286,7 +294,12 @@ def _start_service_with_lock(self):
_log.info("CF_START with configuration: %s", self.cf_config)

if self.client is None: # For setting up mock test client
self.client = ChannelFinderClient()
self.client = ChannelFinderClient(
BaseURL=self.cf_config.base_url,
username=self.cf_config.cf_username,
password=self.cf_config.cf_password,
verify_ssl=self.cf_config.verify_ssl,
)
try:
cf_properties = {cf_property["name"] for cf_property in self.client.getAllProperties()}
required_properties = {
Expand Down
Loading