Project

General

Profile

« Previous | Next » 

Revision 57787

Fixing a logging issue

View differences:

modules/uoa-repository-manager-service/trunk/src/main/resources/log4j.properties
1
log4j.rootLogger = INFO, R
2

  
3
log4j.logger.eu.dnetlib = INFO
4
log4j.logger.eu.dnetlib.repo.manager = INFO
5
log4j.logger.eu.dnetlib.clients.data.datasourcemanager.ws.Converter = FATAL
6
log4j.logger.org.springframework = INFO 
7

  
8
log4j.appender.R=org.apache.log4j.RollingFileAppender
9
log4j.appender.R.File=/var/log/dnet/repository-manager.log
10
log4j.appender.R.MaxFileSize=10MB
11
log4j.appender.R.MaxBackupIndex=10
12
log4j.appender.R.layout=org.apache.log4j.PatternLayout
13
log4j.appender.R.layout.ConversionPattern= %d %p %t [%c] - %m%n
modules/uoa-repository-manager-service/trunk/src/main/resources/application.properties
1
infrastructure.name=integration
1
#container.hostname = dl114.madgik.di.uoa.gr
2
#container.hostname = mpagasas.di.uoa.gr
3
#container.hostname = adonis.athenarc.gr
4
container.hostname = estella.athenarc.gr
2 5

  
3
## Container properties
4
container.hostname=localhost
5
container.context=uoa-repository-manager-service
6
container.port=8480
6
provider.endpoint=http://estella.athenarc.gr:8480/uoa-repository-manager-service
7 7

  
8
IS.url=https://dev-openaire.d4science.org/is/services
9
ISLookUpService.url=${IS.url}/isLookUp
10
ISRegistryService.url=${IS.url}/isRegistry
11
ISSNService.url=${IS.url}/services/isSN
12 8

  
13
#ValidatorService.url=http://88.197.53.69:8080/validator-service/services/validatorWebService
14
#ValidatorService.url=http://beta.services.openaire.eu/validator-service/services/validatorWebService
15
ValidatorService.url=http://localhost:8080/validator-service/services/validatorWebService
9
#container.hostname = validator.mincyt.research-infrastructures.eu
10
container.port = 8080
11
#container.context = <yourContext>
16 12

  
17
services.provide.adminEmail=provide-admin@openaire.eu
13
# BASIC SETTINGS
14
services.validator.mode.user = ldap
15
services.validator.mail.override = false
16
services.validator.mode.repo = dms
17
services.validator.baseUrl = http://${container.hostname}:${container.port}/${container.context}
18
services.validator.dnetWorkflow = true
19
services.validator.deploy.environment = openaire-beta
20
#services.validator.deploy.environment = mincyt
21
services.validator.registration.files.download = true
22
services.validator.autoRestoreOnStartup = false
23
services.validator.mode.standalone = false
24
services.validator.mail.override = false
25
services.validator.adminEmail = antleb@di.uoa.gr
26
services.validator.admins.master = antleb@di.uoa.gr
27
services.validator.admins.secondary = ant.lebesis@gmail.com
28
services.validator.adminBaseUrl = ../validator-admin
29
services.validator.webBaseUrl = http://${container.hostname}:${container.port}/validator
30
services.validator.registrationsReport.email = ant.lebesis@gmail.com
31
services.repo-manager.repository.testing.mode = false
18 32

  
19
## Broker Service
20
services.broker.url=http://broker1-dev-dnet.d4science.org
21
services.broker.port=8080
22
services.broker.api=api/
23
services.broker.openaire=openaireBroker
33
# EMAIL SETTINGS
34
services.validator.mail.host = smtp.gmail.com
35
services.validator.mail.port = 465
36
services.validator.mail.username = test.openaire@gmail.com
37
services.validator.mail.password = ^($*@$)*!$
38
services.validator.mail.authenticate = true
39
services.validator.mail.mode = ssl
40
ervices.validator.mail.fromAddress = no-reply@mpagasas.openaire.eu
41
services.validator.mail.override = false
42
services.validator.mail.overrideEmail = nikonas@di.uoa.gr
43
services.validator.mail.specialRecipients = antleb@di.uoa.gr
24 44

  
25
#api.baseAddress=https://dev-openaire.d4science.org/openaire
26
api.baseAddress=http://beta.services.openaire.eu/openaire
27 45

  
28
service.repository-rest-api.baseUrl=http://${container.hostname}:${container.port}
29
services.repo-manager.baseUrl=http://${container.hostname}:${container.port}/${container.context}
46
# VALIDATOR DB
47
services.validator.db.driverClassName = org.postgresql.Driver
48
#services.validator.db.url = jdbc:postgresql://194.177.192.119:5432/validator
49
services.validator.db.url = jdbc:postgresql://88.197.53.70:5432/validator
50
services.validator.db.username = dnet
51
services.validator.db.password = dnetPwd
30 52

  
53
# IS
54
#ISLookUpService.url = http://node1.t.openaire.research-infrastructures.eu:8280/is/services/isLookUp
55
#ISRegistryService.url = http://node1.t.openaire.research-infrastructures.eu:8280/is/services/isRegistry
56
#ISSNService.url = http://node1.t.openaire.research-infrastructures.eu:8280/is/services/isSN
57

  
58
#ISLookUpService.url = http://skalny.icm.edu.pl:8280/is/services/isLookUp
59
#ISRegistryService.url = http://skalny.icm.edu.pl:8280/is/services/isRegistry
60
#ISSNService.url = skalny.icm.edu.pl:8280/is/services/isSN
61

  
62
#ISLookUpService.url = http://node0.t.openaire.research-infrastructures.eu:8080/is/services/isLookUp
63
#ISRegistryService.url = http://node0.t.openaire.research-infrastructures.eu:8080/is/services/isRegistry
64
#ISSNService.url = http://node0.t.openaire.research-infrastructures.eu:8080/is/services/isSN
65

  
66
#ISLookUpService.url = http://node6.t.openaire.research-infrastructures.eu:8980/dnet/services/isLookUp
67
#ISRegistryService.url = http://node6.t.openaire.research-infrastructures.eu:8980/dnet/services/isRegistry
68
#ISSNService.url = http://node6.t.openaire.research-infrastructures.eu:8980/dnet/services/isSN
69

  
70
#ISLookUpService.url = http://node6.t.openaire.research-infrastructures.eu:8280/is/services/isLookUp
71
#ISRegistryService.url = http://node6.t.openaire.research-infrastructures.eu:8280/is/services/isRegistry
72
#ISSNService.url = http://node6.t.openaire.research-infrastructures.eu:8280/is/services/isSN
73

  
74
#ISLookUpService.url = http://aggregator.mincyt.research-infrastructures.eu:8080/is/services/isLookUp
75
#ISRegistryService.url = http://aggregator.mincyt.research-infrastructures.eu:8080/is/services/isRegistry
76
#ISSNService.url = http://aggregator.mincyt.research-infrastructures.eu:8080/is/services/isSN
77

  
78
#ISLookUpService.url = http://node0.d.hudl.research-infrastructures.eu:8080/is/services/isLookUp
79
#ISRegistryService.url = http://node0.d.hudl.research-infrastructures.eu:8080/is/services/isRegistry
80
#ISSNService.url = http://node0.d.hudl.research-infrastructures.eu:8080/is/is/services/isSN
81

  
82
ISLookUpService.url = https://dev-openaire.d4science.org:443/is/services/isLookUp
83
ISRegistryService.url = https://dev-openaire.d4science.org:443/is/services/isRegistry
84
ISSNService.url = https://dev-openaire.d4science.org:443/is/services/isSN
85
ValidatorService.url=http://estella.athenarc.gr:8080/validator-service/services/validatorWebService
86

  
87
# LDAP
88
#services.validator.ldap.address = 88.197.53.113
89
#services.validator.ldap.address = 194.197.192.119
90
#services.validator.ldap.port = 389
91
#services.validator.ldap.username = cn=admin,dc=openaire,dc=eu
92
#services.validator.ldap.password = serenata
93
#services.validator.ldap.usersDN = ou=users,dc=openaire,dc=eu
94

  
95
services.users.ldap.address = 194.177.192.119
96
services.users.ldap.port = 389
97
services.users.ldap.username = cn=admin,dc=openaire,dc=eu
98
services.users.ldap.password = serenata
99
services.users.ldap.usersDN = ou=users,dc=openaire,dc=eu
100

  
101
services.validator.ldap.address = 194.177.192.119
102
services.validator.ldap.port = 389
103
services.validator.ldap.username = cn=admin,dc=openaire,dc=eu
104
services.validator.ldap.password = serenata
105
services.validator.ldap.usersDN = ou=users,dc=openaire,dc=eu
106

  
107
#AAI-REDIS
108
redis.host = estella.athenarc.gr
109
redis.port = 6379
110
redis.password = redis123
111

  
112
oidc.dev.home = http://localhost:8480/uoa-repository-manager-service/openid_connect_login
113
webapp.dev.front = http://localhost:4200/dashboard
114

  
115
repomanager.db.driverClassName=org.postgresql.Driver
116
repomanager.db.url=jdbc:postgresql://194.177.192.119:5432/repomanager
117
repomanager.db.username=dnet
118
repomanager.db.password=dnetPwd
119
infrastructure.name=integration
120

  
31 121
transport.soap.baseAddress=http://${container.hostname}:${container.port}/${container.context}
32 122
transport.soap.force.local.address=false
33

  
34

  
35
validator.results.url=https://${container.hostname}:${container.port}/compatibility/browseHistory/
36
services.repo-manager.adminEmail=antleb@di.uoa.gr
37
services.repo-manager.repository.testing.mode=false
38
services.repo-manager.deploy.environment=development
39 123
services.validator.mail.host=smtp.gmail.com
40 124
services.validator.mail.port=465
41 125
services.validator.mail.fromAddress=no-reply@openaire.eu
......
49 133
services.validator.mail.debug=false
50 134
services.validator.mail.overrideEmail=antleb@di.uoa.gr
51 135
services.validator.mail.specialRecipients=antleb@di.uoa.gr
52

  
53 136
services.validator.repoRegistration.override=antleb@di.uoa.gr
54 137

  
55
repomanager.db.driverClassName=org.postgresql.Driver
56
repomanager.db.url=jdbc:postgresql://194.177.192.119:5432/repomanager
57
repomanager.db.username=dnet
58
repomanager.db.password=dnetPwd
59

  
60
services.repomanager.analyticsURL=http://analytics.openaire.eu/addsite.php?
61

  
62
topic_types.url=https://beta.services.openaire.eu/provision/mvc/vocabularies/dnet:topic_types.json
63

  
64 138
oidc.issuer=https://aai.openaire.eu/oidc/
65 139
oidc.id=767422b9-5461-4807-a80a-f9a2072d3a7d
66 140
oidc.secret=AMQtGlbTXNjwjhF0st28LmM6V0XypMdaVS7tJmGuYFlmH36iIv4t7tVqYuLYrNPkhnZ_GPUJvhymBhFupdgb6aU
67

  
68
oidc.dev.home=http://localhost:8480/uoa-repository-manager-service/openid_connect_login
69
webapp.dev.front=http://localhost:4200/landing
70

  
71
##REDIS-AAI
72

  
73
redis.host=localhost
74
redis.port=6379
75
redis.password=redis123
76
aai.mode=develop
77

  
78

  
141
search.api.baseAddress=https://beta.services.openaire.eu/search/v2/api
142
search.api.usagestats=https://services.openaire.eu/usagestats
143
search.api.usageEvents=http://beta.lbs.openaire.eu:8080/ajax/summary
144
api.baseAddress=http://beta.services.openaire.eu/openaire
145
services.repo-manager.baseUrl=http://${container.hostname}:${container.port}/${container.context}
146
services.repo-manager.adminEmail=antleb@di.uoa.gr
147
services.repo-manager.repository.testing.mode=false
148
services.repo-manager.deploy.environment=development
79 149
services.repomanager.usageStatisticsDiagramsBaseURL=https://beta.openaire.eu/stats3/
80 150
services.repomanager.usageStatisticsNumbersBaseURL=https://beta.services.openaire.eu/usagestats/datasources/
81 151
services.repomanager.usagestats.adminEmail=antleb@di.uoa.gr
82

  
83
##SUSHI
84 152
services.repomanager.usagestats.sushiliteEndpoint=http://beta.services.openaire.eu/usagestats/sushilite/
153
services.repomanager.analyticsURL=https://analytics.openaire.eu/addsite.php?
85 154

  
86
##SEARCH API
87
search.api.baseAddress=https://beta.services.openaire.eu/search/v2/api
88
search.api.usagestats=https://services.openaire.eu/usagestats
89
search.api.usageEvents=http://beta.lbs.openaire.eu:8080/ajax/summary
155
aai.mode=develop
156
#uoa-repository-manager-service
157
#oidc.dev.home=http://88.197.53.69:8080/uoa-repository-manager-service/openid_connect_login
158
#webapp.dev.front=http://88.197.53.69/landing
159
services.repo-manager.adminEmail=antleb@di.uoa.gr
160
services.repomanager.usagestats.adminEmail=antleb@di.uoa.gr
161
services.provide.adminEmail=antleb@di.uoa.gr
162
validator.results.url=https://beta.provide.openaire.eu/compatibility/browseHistory/
163
topic_types.url=https://beta.services.openaire.eu/provision/mvc/vocabularies/dnet:topic_types.json
164
services.broker.url=http://broker1-dev-dnet.d4science.org
165
services.broker.port=8080
166
services.broker.api=api/
167
services.broker.openaire=openaireBroker
modules/uoa-repository-manager-service/trunk/src/main/webapp/WEB-INF/log4j.properties
1
log4j.rootLogger = INFO, R
1
log4j.rootLogger = INFO
2 2

  
3
log4j.logger.eu.dnetlib = INFO
4
log4j.logger.eu.dnetlib.repo.manager = INFO
3
log4j.logger.eu.dnetlib = INFO, R
4
log4j.logger.eu.dnetlib.repo.manager = INFO, R
5 5
log4j.logger.eu.dnetlib.clients.data.datasourcemanager.ws.Converter = FATAL
6
log4j.logger.org.springframework = INFO 
6
log4j.logger.org.springframework = INFO, R
7 7

  
8 8
log4j.appender.R=org.apache.log4j.RollingFileAppender
9 9
log4j.appender.R.File=/var/log/dnet/repository-manager.log
modules/uoa-repository-manager-service/trunk/src/main/webapp/WEB-INF/web.xml
4 4
    <listener>
5 5
        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
6 6
    </listener>
7
    <listener>
8
        <listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
9
        <!-- TODO: import correct dependency -->
10
<!--        <listener-class>org.apache.logging.log4j.web.Log4jServletContextListener</listener-class>-->
11
    </listener>
12 7

  
13 8
    <context-param>
14 9
        <param-name>contextConfigLocation</param-name>
......
18 13
        </param-value>
19 14
    </context-param>
20 15
    <context-param>
21
        <param-name>log4jConfigLocation</param-name>
22
        <param-value>/WEB-INF/log4j.properties</param-value>
23
    </context-param>
24
    <context-param>
25 16
        <param-name>log4jRefreshInterval</param-name>
26 17
        <param-value>1000</param-value>
27 18
    </context-param>
modules/uoa-repository-manager-service/trunk/pom.xml
32 32
        <dependency>
33 33
            <groupId>log4j</groupId>
34 34
            <artifactId>log4j</artifactId>
35
            <version>(1.2, 1.5]</version>
36
            <scope>runtime</scope>
35
            <version>${log4j.version}</version>
37 36
        </dependency>
38 37

  
39 38
        <dependency>
......
241 240
            <groupId>org.springframework.cloud</groupId>
242 241
            <artifactId>spring-cloud-starter-hystrix</artifactId>
243 242
            <version>1.1.5.RELEASE</version>
243
<!--            <exclusions>-->
244
<!--                <exclusion>-->
245
<!--                    <groupId>org.springframework.boot</groupId>-->
246
<!--                    <artifactId>spring-boot-starter-logging</artifactId>-->
247
<!--                </exclusion>-->
248
<!--            </exclusions>-->
244 249
        </dependency>
245 250

  
246 251
        <!-- https://mvnrepository.com/artifact/javax.xml.ws/jaxws-api -->
......
281 286
            <groupId>org.eurocris</groupId>
282 287
            <artifactId>openaire-cris-validator</artifactId>
283 288
            <version>1.0.1-SNAPSHOT</version>
289
<!--            <exclusions>-->
290
<!--                <exclusion>-->
291
<!--                    <groupId>org.apache.logging.log4j</groupId>-->
292
<!--                    <artifactId>log4j-1.2-api</artifactId>-->
293
<!--                </exclusion>-->
294
<!--            </exclusions>-->
284 295
        </dependency>
285 296

  
286 297
        <dependency>

Also available in: Unified diff