Skip to content
Snippets Groups Projects
Commit 8416b6f2 authored by Jean-Paul Calderone's avatar Jean-Paul Calderone
Browse files

get a version of twisted with logging for gai errors

only useful for debugging failed test runs
parent 8d1617d0
No related branches found
No related tags found
1 merge request!10End-to-end with ristretto
let
pythonTwistedOverride = python-self: python-super: {
twisted = python-super.callPackage ../pkgs/twisted.nix { inherit (python-super) twisted; };
};
in
self: super: {
privatestorage = super.python27.buildEnv.override
privatestorage = self.python27.buildEnv.override
{ extraLibs =
[ super.python27Packages.tahoe-lafs
super.python27Packages.zkapauthorizer
[ self.python27Packages.tahoe-lafs
self.python27Packages.zkapauthorizer
];
# Twisted's dropin.cache always collides between different
# plugin-providing packages.
ignoreCollisions = true;
# ignoreCollisions = true;
};
python27 = super.python27.override (old: {
packageOverrides = super.lib.composeExtensions old.packageOverrides pythonTwistedOverride;
});
}
{ twisted }:
twisted.overrideAttrs (old: {
version = old.version + "-0";
prePatch = old.patchPhase;
patchPhase = null;
patches = (if old ? "patches" then old.patches else []) ++ [ ./twisted.patch ];
})
diff --git a/src/twisted/internet/_resolver.py b/src/twisted/internet/_resolver.py
index 1c16174a2..8c8249db4 100644
--- a/src/twisted/internet/_resolver.py
+++ b/src/twisted/internet/_resolver.py
@@ -74,6 +74,8 @@ class GAIResolver(object):
L{getaddrinfo} in a thread.
"""
+ _log = Logger()
+
def __init__(self, reactor, getThreadPool=None, getaddrinfo=getaddrinfo):
"""
Create a L{GAIResolver}.
@@ -124,6 +126,9 @@ class GAIResolver(object):
socketType)
except gaierror:
return []
+ except Exception as e:
+ self._log.failure("Problem resolving {hostName}", hostName=hostName)
+ return []
d = deferToThreadPool(self._reactor, pool, get)
resolution = HostResolution(hostName)
resolutionReceiver.resolutionBegan(resolution)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment