Changeset - f787c028ffc0
Parent rev.
Child rev.
[Not reviewed]
default
0 3 0
Mads Kiilerich - 6 years ago 2019-10-20 22:03:57
mads@kiilerich.com
Grafted from: 4f04544e8650
utils: drop conditional_cache - an unused beaker cache
3 files changed with 2 insertions and 39 deletions:
development.ini
1
5
kallithea/lib/paster_commands/template.ini.mako
1
5
kallithea/lib/utils.py
29
0 comments (0 inline, 0 general)
development.ini
➞
Show inline comments
 
@@ -254,53 +254,49 @@ ssh_enabled = false
 
use_celery = false
 

			




	
	
	
		
 
## Celery config settings from https://docs.celeryproject.org/en/4.4.0/userguide/configuration.html prefixed with 'celery.'.

			




	
	
	
		
 

			




	
	
	
		
 
## Example: use the message queue on the local virtual host 'kallitheavhost' as the RabbitMQ user 'kallithea':

			




	
	
	
		
 
celery.broker_url = amqp://kallithea:thepassword@localhost:5672/kallitheavhost

			




	
	
	
		
 

			




	
	
	
		
 
celery.result.backend = db+sqlite:///celery-results.db

			




	
	
	
		
 

			




	
	
	
		
 
#celery.amqp.task.result.expires = 18000

			




	
	
	
		
 

			




	
	
	
		
 
celery.worker_concurrency = 2

			




	
	
	
		
 
celery.worker_max_tasks_per_child = 1

			




	
	
	
		
 

			




	
	
	
		
 
## If true, tasks will never be sent to the queue, but executed locally instead.

			




	
	
	
		
 
celery.task_always_eager = false

			




	
	
	
		
 

			




	
	
	
		
 
####################################

			




	
	
	
		
 
###         BEAKER CACHE        ####

			




	
	
	
		
 
####################################

			




	
	
	
		
 

			




	
	
	
		
 
beaker.cache.data_dir = %(here)s/data/cache/data

			




	
	
	
		
 
beaker.cache.lock_dir = %(here)s/data/cache/lock

			




	
	
	
		
 

			




	
	
	
		
 
beaker.cache.regions = short_term,long_term,long_term_file

			




	
	
	
		
 

			




	
	
	
		
 
beaker.cache.short_term.type = memory

			




	
	
	
		
 
beaker.cache.short_term.expire = 60

			




	
	
	
		
 
beaker.cache.short_term.key_length = 256

			




	
	
	
		
 
beaker.cache.regions = long_term,long_term_file

			




	
	
	
		
 

			




	
	
	
		
 
beaker.cache.long_term.type = memory

			




	
	
	
		
 
beaker.cache.long_term.expire = 36000

			




	
	
	
		
 
beaker.cache.long_term.key_length = 256

			




	
	
	
		
 

			




	
	
	
		
 
beaker.cache.long_term_file.type = file

			




	
	
	
		
 
beaker.cache.long_term_file.expire = 604800

			




	
	
	
		
 
beaker.cache.long_term_file.key_length = 256

			




	
	
	
		
 

			




	
	
	
		
 
####################################

			




	
	
	
		
 
###       BEAKER SESSION        ####

			




	
	
	
		
 
####################################

			




	
	
	
		
 

			




	
	
	
		
 
## Name of session cookie. Should be unique for a given host and path, even when running

			




	
	
	
		
 
## on different ports. Otherwise, cookie sessions will be shared and messed up.

			




	
	
	
		
 
session.key = kallithea

			




	
	
	
		
 
## Sessions should always only be accessible by the browser, not directly by JavaScript.

			




	
	
	
		
 
session.httponly = true

			




	
	
	
		
 
## Session lifetime. 2592000 seconds is 30 days.

			




	
	
	
		
 
session.timeout = 2592000

			




	
	
	
		
 

			




	
	
	
		
 
## Server secret used with HMAC to ensure integrity of cookies.

			




	
	
	
		
 
#session.secret = VERY-SECRET

			




	
	
	
		
 
session.secret = development-not-secret

			




        

    


    
    

    

        

                

                    kallithea/lib/paster_commands/template.ini.mako
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -360,53 +360,49 @@ ssh_locale = ${ssh_locale}

			




	
	
	
		
 
use_celery = false

			




	
	
	
		
 

			




	
	
	
		
 
<%text>## Celery config settings from https://docs.celeryproject.org/en/4.4.0/userguide/configuration.html prefixed with 'celery.'.</%text>

			




	
	
	
		
 

			




	
	
	
		
 
<%text>## Example: use the message queue on the local virtual host 'kallitheavhost' as the RabbitMQ user 'kallithea':</%text>

			




	
	
	
		
 
celery.broker_url = amqp://kallithea:thepassword@localhost:5672/kallitheavhost

			




	
	
	
		
 

			




	
	
	
		
 
celery.result.backend = db+sqlite:///celery-results.db

			




	
	
	
		
 

			




	
	
	
		
 
#celery.amqp.task.result.expires = 18000

			




	
	
	
		
 

			




	
	
	
		
 
celery.worker_concurrency = 2

			




	
	
	
		
 
celery.worker_max_tasks_per_child = 1

			




	
	
	
		
 

			




	
	
	
		
 
<%text>## If true, tasks will never be sent to the queue, but executed locally instead.</%text>

			




	
	
	
		
 
celery.task_always_eager = false

			




	
	
	
		
 

			




	
	
	
		
 
<%text>####################################</%text>

			




	
	
	
		
 
<%text>###         BEAKER CACHE        ####</%text>

			




	
	
	
		
 
<%text>####################################</%text>

			




	
	
	
		
 

			




	
	
	
		
 
beaker.cache.data_dir = %(here)s/data/cache/data

			




	
	
	
		
 
beaker.cache.lock_dir = %(here)s/data/cache/lock

			




	
	
	
		
 

			




	
	
	
		
 
beaker.cache.regions = short_term,long_term,long_term_file

			




	
	
	
		
 

			




	
	
	
		
 
beaker.cache.short_term.type = memory

			




	
	
	
		
 
beaker.cache.short_term.expire = 60

			




	
	
	
		
 
beaker.cache.short_term.key_length = 256

			




	
	
	
		
 
beaker.cache.regions = long_term,long_term_file

			




	
	
	
		
 

			




	
	
	
		
 
beaker.cache.long_term.type = memory

			




	
	
	
		
 
beaker.cache.long_term.expire = 36000

			




	
	
	
		
 
beaker.cache.long_term.key_length = 256

			




	
	
	
		
 

			




	
	
	
		
 
beaker.cache.long_term_file.type = file

			




	
	
	
		
 
beaker.cache.long_term_file.expire = 604800

			




	
	
	
		
 
beaker.cache.long_term_file.key_length = 256

			




	
	
	
		
 

			




	
	
	
		
 
<%text>####################################</%text>

			




	
	
	
		
 
<%text>###       BEAKER SESSION        ####</%text>

			




	
	
	
		
 
<%text>####################################</%text>

			




	
	
	
		
 

			




	
	
	
		
 
<%text>## Name of session cookie. Should be unique for a given host and path, even when running</%text>

			




	
	
	
		
 
<%text>## on different ports. Otherwise, cookie sessions will be shared and messed up.</%text>

			




	
	
	
		
 
session.key = kallithea

			




	
	
	
		
 
<%text>## Sessions should always only be accessible by the browser, not directly by JavaScript.</%text>

			




	
	
	
		
 
session.httponly = true

			




	
	
	
		
 
<%text>## Session lifetime. 2592000 seconds is 30 days.</%text>

			




	
	
	
		
 
session.timeout = 2592000

			




	
	
	
		
 

			




	
	
	
		
 
<%text>## Server secret used with HMAC to ensure integrity of cookies.</%text>

			




	
	
	
		
 
session.secret = ${uuid()}

			




	
	
	
		
 
<%text>## Further, encrypt the data with AES.</%text>

			




        

    


    
    

    

        

                

                    kallithea/lib/utils.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -581,53 +581,24 @@ def check_git_version():

			




	
	
	
		
 
        log.warning('No working git executable found - check "git_path" in the ini file.')

			




	
	
	
		
 
        return None

			




	
	
	
		
 

			




	
	
	
		
 
    output = safe_str(stdout).strip()

			




	
	
	
		
 
    m = re.search(r"\d+.\d+.\d+", output)

			




	
	
	
		
 
    if m:

			




	
	
	
		
 
        ver = StrictVersion(m.group(0))

			




	
	
	
		
 
        log.debug('Git executable: "%s", version %s (parsed from: "%s")',

			




	
	
	
		
 
                  settings.GIT_EXECUTABLE_PATH, ver, output)

			




	
	
	
		
 
        if ver < git_req_ver:

			




	
	
	
		
 
            log.error('Kallithea detected %s version %s, which is too old '

			




	
	
	
		
 
                      'for the system to function properly. '

			




	
	
	
		
 
                      'Please upgrade to version %s or later. '

			




	
	
	
		
 
                      'If you strictly need Mercurial repositories, you can '

			




	
	
	
		
 
                      'clear the "git_path" setting in the ini file.',

			




	
	
	
		
 
                      settings.GIT_EXECUTABLE_PATH, ver, git_req_ver)

			




	
	
	
		
 
            log.error("Terminating ...")

			




	
	
	
		
 
            sys.exit(1)

			




	
	
	
		
 
    else:

			




	
	
	
		
 
        ver = StrictVersion('0.0.0')

			




	
	
	
		
 
        log.warning('Error finding version number in "%s --version" stdout:\n%s',

			




	
	
	
		
 
                    settings.GIT_EXECUTABLE_PATH, output)

			




	
	
	
		
 

			




	
	
	
		
 
    return ver

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
#===============================================================================

			




	
	
	
		
 
# CACHE RELATED METHODS

			




	
	
	
		
 
#===============================================================================

			




	
	
	
		
 

			




	
	
	
		
 
def conditional_cache(region, prefix, condition, func):

			




	
	
	
		
 
    """

			




	
	
	
		
 
    Conditional caching function use like::

			




	
	
	
		
 
        def func(arg):

			




	
	
	
		
 
            #heavy computation function

			




	
	
	
		
 
            return data

			




	
	
	
		
 

			




	
	
	
		
 
        # depending from condition the compute is wrapped in cache or not

			




	
	
	
		
 
        compute = conditional_cache('short_term', 'cache_desc', condition=True, func=func)

			




	
	
	
		
 
        return compute(arg)

			




	
	
	
		
 

			




	
	
	
		
 
    :param region: name of cache region

			




	
	
	
		
 
    :param prefix: cache region prefix

			




	
	
	
		
 
    :param condition: condition for cache to be triggered, and return data cached

			




	
	
	
		
 
    :param func: heavy function to compute

			




	
	
	
		
 
    """

			




	
	
	
		
 
    wrapped = func

			




	
	
	
		
 
    if condition:

			




	
	
	
		
 
        log.debug('conditional_cache: True, wrapping call of '

			




	
	
	
		
 
                  'func: %s into %s region cache' % (region, func))

			




	
	
	
		
 
        wrapped = beaker.cache._cache_decorate((prefix,), None, None, region)(func)

			




	
	
	
		
 

			




	
	
	
		
 
    return wrapped

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.