Allow DNSServer to not have proxy servers #9
Conversation
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## main #9 +/- ##
==========================================
- Coverage 98.30% 97.51% -0.80%
==========================================
Files 5 5
Lines 177 201 +24
Branches 31 37 +6
==========================================
+ Hits 174 196 +22
- Misses 2 3 +1
- Partials 1 2 +1
Continue to review full report at Codecov.
|
azmeuk
force-pushed
the
issue-8-no-upstream
branch
3 times, most recently
from
e1c8b6e
to
d540a6e
Compare
|
let me know when this is ready to review again. |
|
It is ready! |
dnserver/cli.py
Outdated
| @@ -47,7 +47,7 @@ def cli_logic(args: list[str]) -> int: | |||
| parsed_args = parser.parse_args(args) | |||
|
|
|||
| port = parsed_args.port or os.getenv('DNSERVER_PORT', None) | |||
| upstream = parsed_args.upstream or os.getenv('DNSERVER_UPSTREAM', None) | |||
| upstream = parsed_args.upstream or os.getenv('DNSERVER_UPSTREAM', DEFAULT_UPSTREAM) | |||
There was a problem hiding this comment.
You'll need another argument --no-upstream.
There was a problem hiding this comment.
Done. Here is how it behaves:
$ python -m dnserver ./example_zones.toml --port 5053 --no-upstream
14:47:51: starting DNS server on port 5053, upstream DNS server "None"
14:47:51: loaded 11 zone record from ./example_zones.toml, without proxy DNS server
^C14:47:57: pid=86001, got signal: SIGINT, stopping...
14:47:57: stopping DNS server
$ python -m dnserver ./example_zones.toml --port 5053 --no-upstream --upstream 8.8.8.8
14:48:03: starting DNS server on port 5053, upstream DNS server "None"
14:48:03: loaded 11 zone record from ./example_zones.toml, without proxy DNS server
^C14:48:06: pid=86088, got signal: SIGINT, stopping...
14:48:06: stopping DNS server
$ python -m dnserver ./example_zones.toml --port 5053
14:48:11: starting DNS server on port 5053, upstream DNS server "1.1.1.1"
14:48:11: loaded 11 zone record from ./example_zones.toml, with 1.1.1.1 as a proxy DNS server
^C14:48:12: pid=86152, got signal: SIGINT, stopping...
14:48:12: stopping DNS server
dnserver/main.py
Outdated
|
|
||
| def resolve(self, request, handler): | ||
| class ResolverMixin: | ||
| def resolve_(self, request, handler, records): |
There was a problem hiding this comment.
if you're using a different function and passing records as an argument, this doesn't need to be a mixin at all, it can just be a plain function.
azmeuk
force-pushed
the
issue-8-no-upstream
branch
2 times, most recently
from
f5e9161
to
849bfa9
Compare
|
This should be better now. |
azmeuk
force-pushed
the
issue-8-no-upstream
branch
from
849bfa9
to
91c7a9c
Compare
|
We are close :) |
|
Great, thanks so much. In future, please don't force push - commits are merged anyway, and force pushing makes it much harder for me to see what's changes after a review. |
|
Ok I understand. Thank you taking time to review this. |
|
No problem, thanks for the contributions. |
Fixes #8