rhodecode-enterprise-ce Files · pkgs/patches/supervisor/patch-rlimits-old-kernel.diff

artifacts: expose a special auth-token based artifacts download urls....

artifacts: expose a special auth-token based artifacts download urls. This will allow sharing download to external locations used new generated artifact download tokens. This feature allows also serving downloads using secret urls with all the fancy logic of our auth tokens.

marcink - - Load All Authors

File last commit:

r3139:1ca05d4b default


                r4003:09f31efc

default

Download file

             patch-rlimits-old-kernel.diff
        
                    16 lines
            
             | 795 B
            
                | text/x-diff
            
             |
                DiffLexer
            
             / pkgs / patches / supervisor / patch-rlimits-old-kernel.diff
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      diff -rup supervisor-3.3.4-orig/supervisor/options.py supervisor-3.3.4/supervisor/options.py

      --- supervisor-3.3.4-orig/supervisor/options.py	1970-01-01 01:00:01.000000000 +0100

      +++ supervisor-3.3.4/supervisor-new/options.py	2018-10-24 10:53:19.368503735 +0200

      @@ -1395,7 +1395,11 @@ class ServerOptions(Options):

                   name = limit['name']

                   name = name # name is used below by locals()

      -            soft, hard = resource.getrlimit(res)

      +            try:

      +                soft, hard = resource.getrlimit(res)

      +            except Exception:

      +                # handle old kernel problems, this is not critical to execute

      +                soft, hard = -1, -1

                   if (soft < min) and (soft != -1): # -1 means unlimited

                       if (hard < min) and (hard != -1):

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				diff -rup supervisor-3.3.4-orig/supervisor/options.py supervisor-3.3.4/supervisor/options.py
				--- supervisor-3.3.4-orig/supervisor/options.py 1970-01-01 01:00:01.000000000 +0100
				+++ supervisor-3.3.4/supervisor-new/options.py 2018-10-24 10:53:19.368503735 +0200
				@@ -1395,7 +1395,11 @@ class ServerOptions(Options):
				name = limit['name']
				name = name # name is used below by locals()

				- soft, hard = resource.getrlimit(res)
				+ try:
				+ soft, hard = resource.getrlimit(res)
				+ except Exception:
				+ # handle old kernel problems, this is not critical to execute
				+ soft, hard = -1, -1

				if (soft < min) and (soft != -1): # -1 means unlimited
				if (hard < min) and (hard != -1):