Changeset - 55ccfc66479d
Parent rev.
Child rev.
[Not reviewed]
default
0 7 0
Mads Kiilerich - 10 years ago 2015-10-08 23:21:58
madski@unity3d.com
cache: make instance_id = * the default and deprecate it

Auto assigning instance_id's works perfectly fine now when the clean-up issue
has been resolved.
7 files changed with 1 insertions and 31 deletions:
development.ini
6
docs/setup.rst
5
docs/usage/performance.rst
1
kallithea/bin/template.ini.mako
6
kallithea/config/deployment.ini_tmpl
6
kallithea/config/environment.py
1
1
kallithea/tests/test.ini
6
0 comments (0 inline, 0 general)
development.ini
➞
Show inline comments
 
@@ -280,12 +280,6 @@ issue_prefix = #
 
#issue_server_link_wiki = https://wiki.example.com/{id}
 
#issue_prefix_wiki = WIKI-
 

			




	
	
	
		
 
## instance-id prefix

			




	
	
	
		
 
## a prefix key for this instance used for cache invalidation when running

			




	
	
	
		
 
## multiple instances of kallithea, make sure it's globally unique for

			




	
	
	
		
 
## all running kallithea instances. Leave empty if you don't use it

			




	
	
	
		
 
instance_id =

			




	
	
	
		
 

			




	
	
	
		
 
## alternative return HTTP header for failed authentication. Default HTTP

			




	
	
	
		
 
## response is 401 HTTPUnauthorized. Currently Mercurial clients have trouble with

			




	
	
	
		
 
## handling that. Set this variable to 403 to return HTTPForbidden

			




        

    


    
    

    

        

                

                    docs/setup.rst
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -746,11 +746,6 @@ Or if using a dispatcher WSGI script wit

			




	
	
	
		
 
   When running apache as root, please make sure it doesn't run Kallithea as

			




	
	
	
		
 
   root, for examply by adding: ``user=www-data group=www-data`` to the configuration.

			




	
	
	
		
 

			




	
	
	
		
 
.. note::

			




	
	
	
		
 
   If running Kallithea in multiprocess mode,

			




	
	
	
		
 
   make sure you set ``instance_id = *`` in the configuration so each process

			




	
	
	
		
 
   gets it's own cache invalidation key.

			




	
	
	
		
 

			




	
	
	
		
 
Example WSGI dispatch script:

			




	
	
	
		
 

			




	
	
	
		
 
.. code-block:: python

			




        

    


    
    

    

        

                

                    docs/usage/performance.rst
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -38,7 +38,6 @@ Follow these few steps to improve perfor

			




	
	
	
		
 
    scaled horizontally on one (recommended) or multiple machines. In order

			




	
	
	
		
 
    to scale horizontally you need to do the following:

			




	
	
	
		
 

			




	
	
	
		
 
    - Each instance needs its own .ini file and unique ``instance_id`` set.

			




	
	
	
		
 
    - Each instance's ``data`` storage needs to be configured to be stored on a

			




	
	
	
		
 
      shared disk storage, preferably together with repositories. This ``data``

			




	
	
	
		
 
      dir contains template caches, sessions, whoosh index and is used for

			




        

    


    
    

    

        

                

                    kallithea/bin/template.ini.mako
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -278,12 +278,6 @@ issue_prefix = #

			




	
	
	
		
 
#issue_server_link_wiki = https://wiki.example.com/{id}

			




	
	
	
		
 
#issue_prefix_wiki = WIKI-

			




	
	
	
		
 

			




	
	
	
		
 
<%text>## instance-id prefix</%text>

			




	
	
	
		
 
<%text>## a prefix key for this instance used for cache invalidation when running</%text>

			




	
	
	
		
 
<%text>## multiple instances of kallithea, make sure it's globally unique for</%text>

			




	
	
	
		
 
<%text>## all running kallithea instances. Leave empty if you don't use it</%text>

			




	
	
	
		
 
instance_id =

			




	
	
	
		
 

			




	
	
	
		
 
<%text>## alternative return HTTP header for failed authentication. Default HTTP</%text>

			




	
	
	
		
 
<%text>## response is 401 HTTPUnauthorized. Currently Mercurial clients have trouble with</%text>

			




	
	
	
		
 
<%text>## handling that. Set this variable to 403 to return HTTPForbidden</%text>

			




        

    


    
    

    

        

                

                    kallithea/config/deployment.ini_tmpl
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -274,12 +274,6 @@ issue_prefix = #

			




	
	
	
		
 
#issue_server_link_wiki = https://wiki.example.com/{id}

			




	
	
	
		
 
#issue_prefix_wiki = WIKI-

			




	
	
	
		
 

			




	
	
	
		
 
## instance-id prefix

			




	
	
	
		
 
## a prefix key for this instance used for cache invalidation when running

			




	
	
	
		
 
## multiple instances of kallithea, make sure it's globally unique for

			




	
	
	
		
 
## all running kallithea instances. Leave empty if you don't use it

			




	
	
	
		
 
instance_id =

			




	
	
	
		
 

			




	
	
	
		
 
## alternative return HTTP header for failed authentication. Default HTTP

			




	
	
	
		
 
## response is 401 HTTPUnauthorized. Currently Mercurial clients have trouble with

			




	
	
	
		
 
## handling that. Set this variable to 403 to return HTTPForbidden

			




        

    


    
    

    

        

                

                    kallithea/config/environment.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -118,7 +118,7 @@ def load_environment(global_conf, app_co

			




	
	
	
		
 
    config['base_path'] = repos_path

			




	
	
	
		
 
    set_app_settings(config)

			




	
	
	
		
 

			




	
	
	
		
 
    instance_id = kallithea.CONFIG.get('instance_id')

			




	
	
	
		
 
    instance_id = kallithea.CONFIG.get('instance_id', '*')

			




	
	
	
		
 
    if instance_id == '*':

			




	
	
	
		
 
        instance_id = '%s-%s' % (platform.uname()[1], os.getpid())

			




	
	
	
		
 
        kallithea.CONFIG['instance_id'] = instance_id

			




        

    


    
    

    

        

                

                    kallithea/tests/test.ini
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -280,12 +280,6 @@ issue_prefix = #

			




	
	
	
		
 
#issue_server_link_wiki = https://wiki.example.com/{id}

			




	
	
	
		
 
#issue_prefix_wiki = WIKI-

			




	
	
	
		
 

			




	
	
	
		
 
## instance-id prefix

			




	
	
	
		
 
## a prefix key for this instance used for cache invalidation when running

			




	
	
	
		
 
## multiple instances of kallithea, make sure it's globally unique for

			




	
	
	
		
 
## all running kallithea instances. Leave empty if you don't use it

			




	
	
	
		
 
instance_id =

			




	
	
	
		
 

			




	
	
	
		
 
## alternative return HTTP header for failed authentication. Default HTTP

			




	
	
	
		
 
## response is 401 HTTPUnauthorized. Currently Mercurial clients have trouble with

			




	
	
	
		
 
## handling that. Set this variable to 403 to return HTTPForbidden

			




        

    



    


    



    



      

      





    
    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.