1
=== modified file 'desktopcouch/__init__.py'
2
--- desktopcouch/__init__.py	2009-11-20 23:36:40 +0000
3
+++ desktopcouch/__init__.py	2010-02-08 14:37:12 +0000
4
@@ -70,11 +70,18 @@
5
70
70
6
71
    # enumerate the process' file descriptors
71
    # enumerate the process' file descriptors
7
72
    fd_dir = os.path.join(proc_dir, 'fd')
72
    fd_dir = os.path.join(proc_dir, 'fd')
8
73
    fd_paths = list()
9
73
    try:
74
    try:
12
74
        fd_paths = [os.readlink(os.path.join(fd_dir, fd))
75
        for dirent in os.listdir(fd_dir):
13
75
                    for fd in os.listdir(fd_dir)]
76
            try:
14
77
                dirent_path = os.path.join(fd_dir, dirent)
15
78
                fd_paths.append(os.readlink(dirent_path))
16
79
            except OSError:
17
80
                log.debug("dirent %r disappeared before we could read it. " %
18
81
                        (dirent_path,))
19
82
                continue
20
76
    except OSError:
83
    except OSError:
22
77
        log.error("Unable to find file descriptors in /proc")
84
        log.exception("Unable to find file descriptors in /proc")
23
78
        raise RuntimeError("Unable to find file descriptors in /proc")
85
        raise RuntimeError("Unable to find file descriptors in /proc")
24
79
86
25
80
    # identify socket fds
87
    # identify socket fds
Status:	Merged
Approved by:	Guillermo Gonzalez on 2010-02-09
Approved revision:	not available
Merged at revision:	not available
Proposed branch:	lp:~cmiller/desktopcouch/get-port-without-fd-race
Merge into:	lp:desktopcouch
Diff against target:	25 lines (+10/-3) 1 file modified desktopcouch/__init__.py (+10/-3)
To merge this branch:	bzr merge lp:~cmiller/desktopcouch/get-port-without-fd-race
Related bugs:	Link a bug report
Reviewer	Date Requested	Status
John O'Brien (community)		Approve on 2010-02-08
Stuart Langridge (community)	2010-02-08	Approve on 2010-02-08
Review via email: mp+18840@code.launchpad.net