import log config into ansible
This commit is contained in:
		
					parent
					
						
							
								0dcb46895a
							
						
					
				
			
			
				commit
				
					
						b4a47c8905
					
				
			
		
					 4 changed files with 36 additions and 5 deletions
				
			
		| 
						 | 
					@ -772,7 +772,7 @@ database:
 | 
				
			||||||
 name: psycopg2
 | 
					 name: psycopg2
 | 
				
			||||||
 args:
 | 
					 args:
 | 
				
			||||||
   user: matrix-synapse
 | 
					   user: matrix-synapse
 | 
				
			||||||
   password: 31913hkVN_L9b3i_0v1RX_ZJXx_AD564_MM_nz
 | 
					   password: "31913hkVN_L9b3i_0v1RX_ZJXx_AD564_MM_nz"
 | 
				
			||||||
   database: matrix-synapse-db
 | 
					   database: matrix-synapse-db
 | 
				
			||||||
   host: postgresql-mtx.lat.internal.ru.com
 | 
					   host: postgresql-mtx.lat.internal.ru.com
 | 
				
			||||||
   port: 5432
 | 
					   port: 5432
 | 
				
			||||||
| 
						 | 
					@ -792,7 +792,7 @@ database:
 | 
				
			||||||
# A yaml python logging config file as described by
 | 
					# A yaml python logging config file as described by
 | 
				
			||||||
# https://docs.python.org/3.7/library/logging.config.html#configuration-dictionary-schema
 | 
					# https://docs.python.org/3.7/library/logging.config.html#configuration-dictionary-schema
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
log_config: "/data/log.yaml"
 | 
					log_config: "/config/log.yaml"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
## Ratelimiting ##
 | 
					## Ratelimiting ##
 | 
				
			||||||
| 
						 | 
					@ -2919,4 +2919,3 @@ redis:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# vim:ft=yaml
 | 
					# vim:ft=yaml
 | 
				
			||||||
EOF
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										33
									
								
								ansible/roles/docker-compose/files/synapse/config/log.yaml
									
										
									
									
									
										Executable file
									
								
							
							
						
						
									
										33
									
								
								ansible/roles/docker-compose/files/synapse/config/log.yaml
									
										
									
									
									
										Executable file
									
								
							| 
						 | 
					@ -0,0 +1,33 @@
 | 
				
			||||||
 | 
					version: 1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					formatters:
 | 
				
			||||||
 | 
					  fmt:
 | 
				
			||||||
 | 
					    format: '%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s- %(message)s'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					filters:
 | 
				
			||||||
 | 
					  context:
 | 
				
			||||||
 | 
					    (): synapse.logging.context.LoggingContextFilter
 | 
				
			||||||
 | 
					    request: ""
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					handlers:
 | 
				
			||||||
 | 
					  console:
 | 
				
			||||||
 | 
					    class: logging.StreamHandler
 | 
				
			||||||
 | 
					    formatter: fmt
 | 
				
			||||||
 | 
					    filters: [context]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					root:
 | 
				
			||||||
 | 
					  level: INFO
 | 
				
			||||||
 | 
					  handlers: [console] # to use file handler instead, switch to [file]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					loggers:
 | 
				
			||||||
 | 
					  synapse:
 | 
				
			||||||
 | 
					    level: INFO
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  synapse.storage.SQL:
 | 
				
			||||||
 | 
					    level: INFO
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  ldap3:
 | 
				
			||||||
 | 
					    level: INFO
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  ldap_auth_provider:
 | 
				
			||||||
 | 
					    level: INFO
 | 
				
			||||||
| 
						 | 
					@ -2,7 +2,6 @@ version: '3'
 | 
				
			||||||
services:
 | 
					services:
 | 
				
			||||||
  synapse:
 | 
					  synapse:
 | 
				
			||||||
    image: matrixdotorg/synapse:${SYNAPSE_VERSION}
 | 
					    image: matrixdotorg/synapse:${SYNAPSE_VERSION}
 | 
				
			||||||
    environment:
 | 
					 | 
				
			||||||
    ports:
 | 
					    ports:
 | 
				
			||||||
      - "8008:8008/tcp"
 | 
					      - "8008:8008/tcp"
 | 
				
			||||||
    volumes:
 | 
					    volumes:
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -98,7 +98,7 @@
 | 
				
			||||||
    src: files/{{ item }}/
 | 
					    src: files/{{ item }}/
 | 
				
			||||||
    dest: /home/{{ ansible_user }}/docker_compose/{{ item }}
 | 
					    dest: /home/{{ ansible_user }}/docker_compose/{{ item }}
 | 
				
			||||||
    owner: "{{ ansible_user }}"
 | 
					    owner: "{{ ansible_user }}"
 | 
				
			||||||
    mode: '0600'
 | 
					    mode: '0644'
 | 
				
			||||||
  loop: "{{ docker_compose }}"
 | 
					  loop: "{{ docker_compose }}"
 | 
				
			||||||
  tags:
 | 
					  tags:
 | 
				
			||||||
    - files
 | 
					    - files
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue