Changeset - e9c9f2e07de8
Parent rev.
Child rev.
[Not reviewed]
default
0 5 0
timeless@gmail.com - 10 years ago 2016-05-03 07:01:51
timeless@gmail.com
spelling: additional
5 files changed with 5 insertions and 5 deletions:
development.ini
1
1
kallithea/bin/template.ini.mako
1
1
kallithea/config/deployment.ini_tmpl
1
1
kallithea/tests/models/test_users.py
1
1
kallithea/tests/test.ini
1
1
0 comments (0 inline, 0 general)
development.ini
➞
Show inline comments
 
@@ -405,49 +405,49 @@ errormator.server_url = https://api.erro
 
errormator.api_key = YOUR_API_KEY
 

			




	
	
	
		
 
## TWEAK AMOUNT OF INFO SENT HERE

			




	
	
	
		
 

			




	
	
	
		
 
## enables 404 error logging (default False)

			




	
	
	
		
 
errormator.report_404 = false

			




	
	
	
		
 

			




	
	
	
		
 
## time in seconds after request is considered being slow (default 1)

			




	
	
	
		
 
errormator.slow_request_time = 1

			




	
	
	
		
 

			




	
	
	
		
 
## record slow requests in application

			




	
	
	
		
 
## (needs to be enabled for slow datastore recording and time tracking)

			




	
	
	
		
 
errormator.slow_requests = true

			




	
	
	
		
 

			




	
	
	
		
 
## enable hooking to application loggers

			




	
	
	
		
 
#errormator.logging = true

			




	
	
	
		
 

			




	
	
	
		
 
## minimum log level for log capture

			




	
	
	
		
 
#errormator.logging.level = WARNING

			




	
	
	
		
 

			




	
	
	
		
 
## send logs only from erroneous/slow requests

			




	
	
	
		
 
## (saves API quota for intensive logging)

			




	
	
	
		
 
errormator.logging_on_error = false

			




	
	
	
		
 

			




	
	
	
		
 
## list of additonal keywords that should be grabbed from environ object

			




	
	
	
		
 
## list of additional keywords that should be grabbed from environ object

			




	
	
	
		
 
## can be string with comma separated list of words in lowercase

			




	
	
	
		
 
## (by default client will always send following info:

			




	
	
	
		
 
## 'REMOTE_USER', 'REMOTE_ADDR', 'SERVER_NAME', 'CONTENT_TYPE' + all keys that

			




	
	
	
		
 
## start with HTTP* this list be extended with additional keywords here

			




	
	
	
		
 
errormator.environ_keys_whitelist =

			




	
	
	
		
 

			




	
	
	
		
 
## list of keywords that should be blanked from request object

			




	
	
	
		
 
## can be string with comma separated list of words in lowercase

			




	
	
	
		
 
## (by default client will always blank keys that contain following words

			




	
	
	
		
 
## 'password', 'passwd', 'pwd', 'auth_tkt', 'secret', 'csrf'

			




	
	
	
		
 
## this list be extended with additional keywords set here

			




	
	
	
		
 
errormator.request_keys_blacklist =

			




	
	
	
		
 

			




	
	
	
		
 
## list of namespaces that should be ignores when gathering log entries

			




	
	
	
		
 
## can be string with comma separated list of namespaces

			




	
	
	
		
 
## (by default the client ignores own entries: errormator_client.client)

			




	
	
	
		
 
errormator.log_namespace_blacklist =

			




	
	
	
		
 

			




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

			




	
	
	
		
 
### [sentry] ###

			




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

			




	
	
	
		
 

			




	
	
	
		
 
## sentry is a alternative open source error aggregator

			




	
	
	
		
 
## you must install python packages `sentry` and `raven` to enable

			




        

    


    
    

    

        

                

                    kallithea/bin/template.ini.mako
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -403,49 +403,49 @@ errormator.server_url = https://api.erro

			




	
	
	
		
 
errormator.api_key = YOUR_API_KEY

			




	
	
	
		
 

			




	
	
	
		
 
<%text>## TWEAK AMOUNT OF INFO SENT HERE</%text>

			




	
	
	
		
 

			




	
	
	
		
 
<%text>## enables 404 error logging (default False)</%text>

			




	
	
	
		
 
errormator.report_404 = false

			




	
	
	
		
 

			




	
	
	
		
 
<%text>## time in seconds after request is considered being slow (default 1)</%text>

			




	
	
	
		
 
errormator.slow_request_time = 1

			




	
	
	
		
 

			




	
	
	
		
 
<%text>## record slow requests in application</%text>

			




	
	
	
		
 
<%text>## (needs to be enabled for slow datastore recording and time tracking)</%text>

			




	
	
	
		
 
errormator.slow_requests = true

			




	
	
	
		
 

			




	
	
	
		
 
<%text>## enable hooking to application loggers</%text>

			




	
	
	
		
 
#errormator.logging = true

			




	
	
	
		
 

			




	
	
	
		
 
<%text>## minimum log level for log capture</%text>

			




	
	
	
		
 
#errormator.logging.level = WARNING

			




	
	
	
		
 

			




	
	
	
		
 
<%text>## send logs only from erroneous/slow requests</%text>

			




	
	
	
		
 
<%text>## (saves API quota for intensive logging)</%text>

			




	
	
	
		
 
errormator.logging_on_error = false

			




	
	
	
		
 

			




	
	
	
		
 
<%text>## list of additonal keywords that should be grabbed from environ object</%text>

			




	
	
	
		
 
<%text>## list of additional keywords that should be grabbed from environ object</%text>

			




	
	
	
		
 
<%text>## can be string with comma separated list of words in lowercase</%text>

			




	
	
	
		
 
<%text>## (by default client will always send following info:</%text>

			




	
	
	
		
 
<%text>## 'REMOTE_USER', 'REMOTE_ADDR', 'SERVER_NAME', 'CONTENT_TYPE' + all keys that</%text>

			




	
	
	
		
 
<%text>## start with HTTP* this list be extended with additional keywords here</%text>

			




	
	
	
		
 
errormator.environ_keys_whitelist =

			




	
	
	
		
 

			




	
	
	
		
 
<%text>## list of keywords that should be blanked from request object</%text>

			




	
	
	
		
 
<%text>## can be string with comma separated list of words in lowercase</%text>

			




	
	
	
		
 
<%text>## (by default client will always blank keys that contain following words</%text>

			




	
	
	
		
 
<%text>## 'password', 'passwd', 'pwd', 'auth_tkt', 'secret', 'csrf'</%text>

			




	
	
	
		
 
<%text>## this list be extended with additional keywords set here</%text>

			




	
	
	
		
 
errormator.request_keys_blacklist =

			




	
	
	
		
 

			




	
	
	
		
 
<%text>## list of namespaces that should be ignores when gathering log entries</%text>

			




	
	
	
		
 
<%text>## can be string with comma separated list of namespaces</%text>

			




	
	
	
		
 
<%text>## (by default the client ignores own entries: errormator_client.client)</%text>

			




	
	
	
		
 
errormator.log_namespace_blacklist =

			




	
	
	
		
 

			




	
	
	
		
 
%elif error_aggregation_service == 'sentry':

			




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

			




	
	
	
		
 
<%text>### [sentry] ###</%text>

			




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

			




	
	
	
		
 

			




	
	
	
		
 
<%text>## sentry is a alternative open source error aggregator</%text>

			




        

    


    
    

    

        

                

                    kallithea/config/deployment.ini_tmpl
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -398,49 +398,49 @@ errormator.server_url = https://api.erro

			




	
	
	
		
 
errormator.api_key = YOUR_API_KEY

			




	
	
	
		
 

			




	
	
	
		
 
## TWEAK AMOUNT OF INFO SENT HERE

			




	
	
	
		
 

			




	
	
	
		
 
## enables 404 error logging (default False)

			




	
	
	
		
 
errormator.report_404 = false

			




	
	
	
		
 

			




	
	
	
		
 
## time in seconds after request is considered being slow (default 1)

			




	
	
	
		
 
errormator.slow_request_time = 1

			




	
	
	
		
 

			




	
	
	
		
 
## record slow requests in application

			




	
	
	
		
 
## (needs to be enabled for slow datastore recording and time tracking)

			




	
	
	
		
 
errormator.slow_requests = true

			




	
	
	
		
 

			




	
	
	
		
 
## enable hooking to application loggers

			




	
	
	
		
 
#errormator.logging = true

			




	
	
	
		
 

			




	
	
	
		
 
## minimum log level for log capture

			




	
	
	
		
 
#errormator.logging.level = WARNING

			




	
	
	
		
 

			




	
	
	
		
 
## send logs only from erroneous/slow requests

			




	
	
	
		
 
## (saves API quota for intensive logging)

			




	
	
	
		
 
errormator.logging_on_error = false

			




	
	
	
		
 

			




	
	
	
		
 
## list of additonal keywords that should be grabbed from environ object

			




	
	
	
		
 
## list of additional keywords that should be grabbed from environ object

			




	
	
	
		
 
## can be string with comma separated list of words in lowercase

			




	
	
	
		
 
## (by default client will always send following info:

			




	
	
	
		
 
## 'REMOTE_USER', 'REMOTE_ADDR', 'SERVER_NAME', 'CONTENT_TYPE' + all keys that

			




	
	
	
		
 
## start with HTTP* this list be extended with additional keywords here

			




	
	
	
		
 
errormator.environ_keys_whitelist =

			




	
	
	
		
 

			




	
	
	
		
 
## list of keywords that should be blanked from request object

			




	
	
	
		
 
## can be string with comma separated list of words in lowercase

			




	
	
	
		
 
## (by default client will always blank keys that contain following words

			




	
	
	
		
 
## 'password', 'passwd', 'pwd', 'auth_tkt', 'secret', 'csrf'

			




	
	
	
		
 
## this list be extended with additional keywords set here

			




	
	
	
		
 
errormator.request_keys_blacklist =

			




	
	
	
		
 

			




	
	
	
		
 
## list of namespaces that should be ignores when gathering log entries

			




	
	
	
		
 
## can be string with comma separated list of namespaces

			




	
	
	
		
 
## (by default the client ignores own entries: errormator_client.client)

			




	
	
	
		
 
errormator.log_namespace_blacklist =

			




	
	
	
		
 

			




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

			




	
	
	
		
 
### [sentry] ###

			




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

			




	
	
	
		
 

			




	
	
	
		
 
## sentry is a alternative open source error aggregator

			




	
	
	
		
 
## you must install python packages `sentry` and `raven` to enable

			




        

    


    
    

    

        

                

                    kallithea/tests/models/test_users.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -23,49 +23,49 @@ class TestUser(TestControllerPytest):

			




	
	
	
		
 
    def test_create_and_remove(self):

			




	
	
	
		
 
        usr = UserModel().create_or_update(username=u'test_user',

			




	
	
	
		
 
                                           password=u'qweqwe',

			




	
	
	
		
 
                                           email=u'u232@example.com',

			




	
	
	
		
 
                                           firstname=u'u1', lastname=u'u1')

			




	
	
	
		
 
        Session().commit()

			




	
	
	
		
 
        self.assertEqual(User.get_by_username(u'test_user'), usr)

			




	
	
	
		
 
        self.assertEqual(User.get_by_username(u'test_USER', case_insensitive=True), usr)

			




	
	
	
		
 
        self.assertEqual(User.get_by_username(u'test_USER', case_insensitive=False), None)

			




	
	
	
		
 

			




	
	
	
		
 
        # make user group

			




	
	
	
		
 
        user_group = fixture.create_user_group(u'some_example_group')

			




	
	
	
		
 
        Session().commit()

			




	
	
	
		
 

			




	
	
	
		
 
        UserGroupModel().add_user_to_group(user_group, usr)

			




	
	
	
		
 
        Session().commit()

			




	
	
	
		
 

			




	
	
	
		
 
        self.assertEqual(UserGroup.get(user_group.users_group_id), user_group)

			




	
	
	
		
 
        self.assertEqual(UserGroupMember.query().count(), 1)

			




	
	
	
		
 
        UserModel().delete(usr.user_id)

			




	
	
	
		
 
        Session().commit()

			




	
	
	
		
 

			




	
	
	
		
 
        self.assertEqual(UserGroupMember.query().all(), [])

			




	
	
	
		
 

			




	
	
	
		
 
    def test_additonal_email_as_main(self):

			




	
	
	
		
 
    def test_additional_email_as_main(self):

			




	
	
	
		
 
        usr = UserModel().create_or_update(username=u'test_user',

			




	
	
	
		
 
                                           password=u'qweqwe',

			




	
	
	
		
 
                                     email=u'main_email@example.com',

			




	
	
	
		
 
                                     firstname=u'u1', lastname=u'u1')

			




	
	
	
		
 
        Session().commit()

			




	
	
	
		
 

			




	
	
	
		
 
        def do():

			




	
	
	
		
 
            m = UserEmailMap()

			




	
	
	
		
 
            m.email = u'main_email@example.com'

			




	
	
	
		
 
            m.user = usr

			




	
	
	
		
 
            Session().add(m)

			




	
	
	
		
 
            Session().commit()

			




	
	
	
		
 
        self.assertRaises(AttributeError, do)

			




	
	
	
		
 

			




	
	
	
		
 
        UserModel().delete(usr.user_id)

			




	
	
	
		
 
        Session().commit()

			




	
	
	
		
 

			




	
	
	
		
 
    def test_extra_email_map(self):

			




	
	
	
		
 
        usr = UserModel().create_or_update(username=u'test_user',

			




	
	
	
		
 
                                           password=u'qweqwe',

			




	
	
	
		
 
                                     email=u'main_email@example.com',

			




	
	
	
		
 
                                     firstname=u'u1', lastname=u'u1')

			




	
	
	
		
 
        Session().commit()

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    kallithea/tests/test.ini
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -405,49 +405,49 @@ errormator.server_url = https://api.erro

			




	
	
	
		
 
errormator.api_key = YOUR_API_KEY

			




	
	
	
		
 

			




	
	
	
		
 
## TWEAK AMOUNT OF INFO SENT HERE

			




	
	
	
		
 

			




	
	
	
		
 
## enables 404 error logging (default False)

			




	
	
	
		
 
errormator.report_404 = false

			




	
	
	
		
 

			




	
	
	
		
 
## time in seconds after request is considered being slow (default 1)

			




	
	
	
		
 
errormator.slow_request_time = 1

			




	
	
	
		
 

			




	
	
	
		
 
## record slow requests in application

			




	
	
	
		
 
## (needs to be enabled for slow datastore recording and time tracking)

			




	
	
	
		
 
errormator.slow_requests = true

			




	
	
	
		
 

			




	
	
	
		
 
## enable hooking to application loggers

			




	
	
	
		
 
#errormator.logging = true

			




	
	
	
		
 

			




	
	
	
		
 
## minimum log level for log capture

			




	
	
	
		
 
#errormator.logging.level = WARNING

			




	
	
	
		
 

			




	
	
	
		
 
## send logs only from erroneous/slow requests

			




	
	
	
		
 
## (saves API quota for intensive logging)

			




	
	
	
		
 
errormator.logging_on_error = false

			




	
	
	
		
 

			




	
	
	
		
 
## list of additonal keywords that should be grabbed from environ object

			




	
	
	
		
 
## list of additional keywords that should be grabbed from environ object

			




	
	
	
		
 
## can be string with comma separated list of words in lowercase

			




	
	
	
		
 
## (by default client will always send following info:

			




	
	
	
		
 
## 'REMOTE_USER', 'REMOTE_ADDR', 'SERVER_NAME', 'CONTENT_TYPE' + all keys that

			




	
	
	
		
 
## start with HTTP* this list be extended with additional keywords here

			




	
	
	
		
 
errormator.environ_keys_whitelist =

			




	
	
	
		
 

			




	
	
	
		
 
## list of keywords that should be blanked from request object

			




	
	
	
		
 
## can be string with comma separated list of words in lowercase

			




	
	
	
		
 
## (by default client will always blank keys that contain following words

			




	
	
	
		
 
## 'password', 'passwd', 'pwd', 'auth_tkt', 'secret', 'csrf'

			




	
	
	
		
 
## this list be extended with additional keywords set here

			




	
	
	
		
 
errormator.request_keys_blacklist =

			




	
	
	
		
 

			




	
	
	
		
 
## list of namespaces that should be ignores when gathering log entries

			




	
	
	
		
 
## can be string with comma separated list of namespaces

			




	
	
	
		
 
## (by default the client ignores own entries: errormator_client.client)

			




	
	
	
		
 
errormator.log_namespace_blacklist =

			




	
	
	
		
 

			




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

			




	
	
	
		
 
### [sentry] ###

			




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

			




	
	
	
		
 

			




	
	
	
		
 
## sentry is a alternative open source error aggregator

			




	
	
	
		
 
## you must install python packages `sentry` and `raven` to enable

			




        

    



    


    



    



      

      





    
    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.