From ad33d5a6548f09ea423ed0716e89d2c13a908f7c Mon Sep 17 00:00:00 2001 From: assimbly Date: Wed, 16 Dec 2020 16:40:53 +0100 Subject: [PATCH] - database clean up and is now also in user home dir. --- ${activemq.data}/kahadb/db.data | Bin 32768 -> 0 bytes ${activemq.data}/kahadb/db.redo | Bin 32824 -> 0 bytes ${activemq.data}/kahadb/lock | Bin 8 -> 0 bytes build.gradle | 16 +-- gradle.properties | 4 +- logback-spring.xml | 67 +++++++++ .../gateway/config/ApplicationProperties.java | 1 - .../gateway/config/LoggingConfiguration.java | 7 +- .../environment/DBExportXMLConfiguration.java | 38 +++-- .../gateway/web/rest/ConnectorResource.java | 1 - src/main/resources/config/application-dev.yml | 2 +- .../resources/config/application-dev.yml.old | 126 ----------------- .../resources/config/application-prod.yml | 5 +- .../resources/config/application-prod.yml.old | 133 ------------------ src/main/resources/config/application.yml | 3 +- .../20180114132915_added_entity_Flow.xml | 6 - ...14132915_added_entity_constraints_Flow.xml | 12 -- ...12091900_added_entity_constraints_Flow.xml | 30 ---- .../resources/config/liquibase/master.xml | 8 +- src/main/resources/logback-spring.xml | 6 +- .../entities/flow/flow-edit-all.component.ts | 29 ++-- 21 files changed, 128 insertions(+), 366 deletions(-) delete mode 100644 ${activemq.data}/kahadb/db.data delete mode 100644 ${activemq.data}/kahadb/db.redo delete mode 100644 ${activemq.data}/kahadb/lock create mode 100644 logback-spring.xml delete mode 100644 src/main/resources/config/application-dev.yml.old delete mode 100644 src/main/resources/config/application-prod.yml.old delete mode 100644 src/main/resources/config/liquibase/changelog/20200212091900_added_entity_constraints_Flow.xml diff --git a/${activemq.data}/kahadb/db.data b/${activemq.data}/kahadb/db.data deleted file mode 100644 index 17381309e587a6834996ba1a7e82278d135cf624..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32768 zcmeI)&u)}J9KdnbKQ+Pd4kVj+Tf(1$g@lu>Nli=|cjL*+xQt!WEvzhSs}~b}0uwJL zK9KLA58_P+cBUFnHtB)tcQ){Y8DM{WIBW)n9Xs~;ab3BOHkBKuZs=!$pT(*B;9xpa zYoYJhFUqByy%67z-h#JnwE$CIA>z~SI zUDj0|IQCMk+rB-Dk~nm1mx2HS2q1s}0+$gO^ZS1pF1AGg0R#|0;GYnxL5I_I{1Q0*~0R#|0009JsDWLoL@4o8v zp7e2K-SM-!DP&`^HunQ=>xv!Ia8obb`k{+yAR>SO0tg_000IagfB*srAb`M71Wf<` zn@;FiAG@dfy4*Y5&(6wfFPOw}62+4s-b<4th{81W!%36{>Z4v7P+O~=-hNR-1HN-7 zz~B)PKmY**5I_I{1Q0*~0R#{jhJfk+o9F+oPK!SLFs=_-AbY0Am6!C|E!M z0R#|0009ILKmY**5J2Es3H;grKkBm|S%3f9|MqmbH*l>kJINw|00IagfB*srAbfRPKLHr=qV)g( diff --git a/${activemq.data}/kahadb/db.redo b/${activemq.data}/kahadb/db.redo deleted file mode 100644 index 72f0c2826865df1b8fe49118a3c84a41b89006e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32824 zcmeI)ze>YE7y$63{~UY?C$~b=n$l+0!9fsbM;%-g3gRf}69_JXFW{T_4!ZajZhA@X zDmXbfwEDZ!e#fN=-~BS>%OzP>x7*A5_u#4b7D8V4H39?(5FkK+009C72oNAZ;O_}^ z+9|b#fY9HIQ;g$TURMRe_x_=&4}{*`V;C8H4QJVA+(#flfB*pk1PBlyK!5-N0t8lC zAdlDkH!m^GqbBCr#;CejoSZIF_Ngw=j{}3Wp&L8BkJ!=%kpKY#1PBlyK!5-N0t5&U zSTTW4ssp^n#EzR--|dfWdw;jOIy;{g!?K)C%3)E?=F@308PDgV@o-WV;WMg=@b9qG z^>bJ%@U9||@I(Rx2oNAZfB*pk1PBlyuu=luR0l}w0k&d#uH{$iJV}NC0RjXF5FkK+ z009C72>gaXPaWVl7#)KE0RjXF5FkK+009C72&{!bKh*)!a{)U|+VL%b?K1!6M63~5 zQs@vMK!5-N0t5&UAV7csfpruZe6Ir>HnYgHpT8EMowgdmI-Y(x6Cgl<009C72oNAZ JfWUtd_ym~XS@r+` diff --git a/${activemq.data}/kahadb/lock b/${activemq.data}/kahadb/lock deleted file mode 100644 index 109ce504bcf659c850ccbc9508b8d32c71c03baf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8 PcmZQzU@T^I%-IA01fBua diff --git a/build.gradle b/build.gradle index 28ddc9d7..038d9f4b 100644 --- a/build.gradle +++ b/build.gradle @@ -38,9 +38,9 @@ version = '3.1.0' description = "" -sourceCompatibility=1.8 -targetCompatibility=1.8 -assert System.properties["java.specification.version"] == "1.8" || "11" || "12" || "13" +sourceCompatibility=11 +targetCompatibility=11 +assert System.properties["java.specification.version"] == "11" || "12" || "13" apply from: "gradle/docker.gradle" apply from: "gradle/sonar.gradle" @@ -320,11 +320,11 @@ dependencies { // https://mvnrepository.com/artifact/org.quartz-scheduler/quartz implementation group: 'org.quartz-scheduler', name: 'quartz', version: '2.3.0' - implementation group: 'org.apache.activemq', name: 'artemis-core-client', version: '2.12.0' - implementation group: 'org.apache.activemq', name: 'artemis-commons', version: '2.12.0' - implementation group: 'org.apache.activemq', name: 'artemis-server', version: '2.12.0' - implementation group: 'org.apache.activemq', name: 'artemis-selector', version: '2.12.0' - implementation group: 'org.apache.activemq', name: 'artemis-journal', version: '2.12.0' + implementation group: 'org.apache.activemq', name: 'artemis-core-client', version: '2.16.0' + implementation group: 'org.apache.activemq', name: 'artemis-commons', version: '2.16.0' + implementation group: 'org.apache.activemq', name: 'artemis-server', version: '2.16.0' + implementation group: 'org.apache.activemq', name: 'artemis-selector', version: '2.16.0' + implementation group: 'org.apache.activemq', name: 'artemis-journal', version: '2.16.0' //java 9+ implementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.0' diff --git a/gradle.properties b/gradle.properties index c97bd58f..adce867a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -49,8 +49,8 @@ checkstyle_version=8.29 ## The setting is particularly useful for tweaking memory settings. ## Default value: -Xmx1024m -XX:MaxPermSize=256m ## un comment the below line to override the daemon defaults -org.gradle.java.home=C:/Program Files/Java/jdk1.8.0_191 -org.gradle.jvmargs=-Xmx1024m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +org.gradle.java.home=C:/Program Files/AdoptOpenJDK/jdk-11.0.9.101-hotspot +org.gradle.jvmargs=-Xmx1524m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 ## When configured, Gradle will run in incubating parallel mode. ## This option should only be used with decoupled projects. More details, visit diff --git a/logback-spring.xml b/logback-spring.xml new file mode 100644 index 00000000..265e1ef4 --- /dev/null +++ b/logback-spring.xml @@ -0,0 +1,67 @@ + + + + + + + + + + ${user.home}/.assimbly/logs/%d{yyyy-MM-dd}.assimbly.log + 90 + 20GB + + + utf-8 + %d %-5level [%thread] %logger{0}: %msg%n + + + + + 512 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + diff --git a/src/main/java/org/assimbly/gateway/config/ApplicationProperties.java b/src/main/java/org/assimbly/gateway/config/ApplicationProperties.java index 6bea29aa..ebca8797 100644 --- a/src/main/java/org/assimbly/gateway/config/ApplicationProperties.java +++ b/src/main/java/org/assimbly/gateway/config/ApplicationProperties.java @@ -87,5 +87,4 @@ public void setBaseDirectory(String baseDirectory) { } } - } diff --git a/src/main/java/org/assimbly/gateway/config/LoggingConfiguration.java b/src/main/java/org/assimbly/gateway/config/LoggingConfiguration.java index 9bed9d53..727a7bca 100644 --- a/src/main/java/org/assimbly/gateway/config/LoggingConfiguration.java +++ b/src/main/java/org/assimbly/gateway/config/LoggingConfiguration.java @@ -39,12 +39,12 @@ public class LoggingConfiguration { private final String serverPort; private final JHipsterProperties jHipsterProperties; - - public LoggingConfiguration(@Value("${spring.application.name}") String appName, @Value("${server.port}") String serverPort, - JHipsterProperties jHipsterProperties) { + + public LoggingConfiguration(@Value("${spring.application.name}") String appName, @Value("${server.port}") String serverPort, JHipsterProperties jHipsterProperties) { this.appName = appName; this.serverPort = serverPort; this.jHipsterProperties = jHipsterProperties; + if (jHipsterProperties.getLogging().getLogstash().isEnabled()) { addLogstashAppender(context); addContextListener(context); @@ -57,6 +57,7 @@ public LoggingConfiguration(@Value("${spring.application.name}") String appName, private void addContextListener(LoggerContext context) { LogbackLoggerContextListener loggerContextListener = new LogbackLoggerContextListener(); loggerContextListener.setContext(context); + context.addListener(loggerContextListener); } diff --git a/src/main/java/org/assimbly/gateway/config/environment/DBExportXMLConfiguration.java b/src/main/java/org/assimbly/gateway/config/environment/DBExportXMLConfiguration.java index fc7f7a05..166e6a28 100644 --- a/src/main/java/org/assimbly/gateway/config/environment/DBExportXMLConfiguration.java +++ b/src/main/java/org/assimbly/gateway/config/environment/DBExportXMLConfiguration.java @@ -6,6 +6,7 @@ import java.util.Set; import org.assimbly.gateway.domain.Flow; +import org.apache.commons.lang3.StringUtils; import org.assimbly.docconverter.DocConverter; import org.assimbly.gateway.domain.EnvironmentVariables; import org.assimbly.gateway.domain.Gateway; @@ -326,23 +327,21 @@ public void setXMLWireTapEndpointFromDB(WireTapEndpoint wireTapEndpointDB) throw if (confOptionsSplitted.length > 1) { for (String confOption : confOptionsSplitted) { - String[] confOptionSplitted = confOption.split("="); - - if (confOptionSplitted.length > 0) { - Element option = doc.createElement(confOptionSplitted[0]); - option.setTextContent(confOptionSplitted[1]); - options.appendChild(option); - } + String confOptionKey = confOption.split("=")[0]; + String confOptionValue = StringUtils.substringAfter(confOption, "="); + + Element option = doc.createElement(confOptionKey); + option.setTextContent(confOptionValue); + options.appendChild(option); } } else { - String[] confOptionSplitted = confOptions.split("="); + String confOptionKey = confOptions.split("=")[0]; + String confOptionValue = StringUtils.substringAfter(confOptions, "="); - if (confOptionSplitted.length > 0) { - Element option = doc.createElement(confOptionSplitted[0]); - option.setTextContent(confOptionSplitted[1]); - options.appendChild(option); - } + Element option = doc.createElement(confOptionKey); + option.setTextContent(confOptionValue); + options.appendChild(option); } } @@ -410,13 +409,12 @@ public void setEndpointsFromDB(Set endpointsDB) throws Exception { String[] confOptionsSplitted = confOptions.split("&"); for (String confOption : confOptionsSplitted) { - String[] confOptionSplitted = confOption.split("="); - - if (confOptionSplitted.length > 1) { - Element option = doc.createElement(confOptionSplitted[0]); - option.setTextContent(confOptionSplitted[1]); - options.appendChild(option); - } + String confOptionKey = confOption.split("=")[0]; + String confOptionValue = StringUtils.substringAfter(confOption, "="); + + Element option = doc.createElement(confOptionKey); + option.setTextContent(confOptionValue); + options.appendChild(option); } } diff --git a/src/main/java/org/assimbly/gateway/web/rest/ConnectorResource.java b/src/main/java/org/assimbly/gateway/web/rest/ConnectorResource.java index 9791f5f7..95196270 100644 --- a/src/main/java/org/assimbly/gateway/web/rest/ConnectorResource.java +++ b/src/main/java/org/assimbly/gateway/web/rest/ConnectorResource.java @@ -853,7 +853,6 @@ private void init() throws Exception { } connectorIsStarting = true; - System.out.println("adding failureListener"); connector.addEventNotifier(failureListener); connector.start(); diff --git a/src/main/resources/config/application-dev.yml b/src/main/resources/config/application-dev.yml index 87262924..dd5aaa07 100644 --- a/src/main/resources/config/application-dev.yml +++ b/src/main/resources/config/application-dev.yml @@ -42,7 +42,7 @@ spring: indent-output: true datasource: type: com.zaxxer.hikari.HikariDataSource - url: jdbc:h2:file:./build/h2db/db/gateway;DB_CLOSE_DELAY=-1 + url: jdbc:h2:file:${user.home}/.assimbly/db/gateway;DB_CLOSE_DELAY=-1 username: gateway password: hikari: diff --git a/src/main/resources/config/application-dev.yml.old b/src/main/resources/config/application-dev.yml.old deleted file mode 100644 index 53a90c51..00000000 --- a/src/main/resources/config/application-dev.yml.old +++ /dev/null @@ -1,126 +0,0 @@ -# =================================================================== -# Spring Boot configuration for the "dev" profile. -# -# This configuration overrides the application.yml file. -# -# More information on profiles: https://www.jhipster.tech/profiles/ -# More information on configuration properties: https://www.jhipster.tech/common-application-properties/ -# =================================================================== - -# =================================================================== -# Standard Spring Boot properties. -# Full reference is available at: -# http://docs.spring.io/spring-boot/docs/current/reference/html/common-application-properties.html -# =================================================================== - -logging: - level: - ROOT: DEBUG - io.github.jhipster: DEBUG - org.assimbly.gateway: DEBUG - -spring: - profiles: - active: dev - include: - - swagger - # Uncomment to activate TLS for the dev profile - #- tls - devtools: - restart: - enabled: true - additional-exclude: .h2.server.properties - livereload: - enabled: false # we use Webpack dev server + BrowserSync for livereload - jackson: - serialization: - indent-output: true - datasource: - type: com.zaxxer.hikari.HikariDataSource - url: jdbc:h2:file:./build/h2db/db/gateway;DB_CLOSE_DELAY=-1 - username: gateway - password: - hikari: - auto-commit: false - h2: - console: - enabled: false - jpa: - database-platform: io.github.jhipster.domain.util.FixedH2Dialect - database: H2 - show-sql: true - properties: - hibernate.id.new_generator_mappings: true - hibernate.connection.provider_disables_autocommit: true - hibernate.cache.use_second_level_cache: true - hibernate.cache.use_query_cache: false - hibernate.generate_statistics: true - hibernate.cache.region.factory_class: io.github.jhipster.config.jcache.BeanClassLoaderAwareJCacheRegionFactory - liquibase: - contexts: dev - mail: - host: localhost - port: 25 - username: - password: - messages: - cache-duration: PT1S # 1 second, see the ISO 8601 standard - thymeleaf: - cache: false - -server: - port: 8080 - -# =================================================================== -# JHipster specific properties -# -# Full reference is available at: https://www.jhipster.tech/common-application-properties/ -# =================================================================== - -jhipster: - http: - version: V_1_1 # To use HTTP/2 you will need to activate TLS (see application-tls.yml) - cache: # Cache configuration - ehcache: # Ehcache configuration - time-to-live-seconds: 3600 # By default objects stay 1 hour in the cache - max-entries: 100 # Number of objects in each cache entry - # CORS is only enabled by default with the "dev" profile, so BrowserSync can access the API - cors: - allowed-origins: "*" - allowed-methods: "*" - allowed-headers: "*" - exposed-headers: "Link,X-Total-Count" - allow-credentials: true - max-age: 1800 - security: - remember-me: - # security key (this key should be unique for your application, and kept secret) - key: 3ff0a5bceb965db5bcb77fecccd1ce908c269e49 - mail: # specific JHipster mail property, for standard properties see MailProperties - from: gateway@localhost - base-url: http://127.0.0.1:8080 - metrics: # DropWizard Metrics configuration, used by MetricsConfiguration - jmx: - enabled: true - prometheus: - enabled: false #expose metrics via prometheus - logs: # Reports Dropwizard metrics in the logs - enabled: false - report-frequency: 60 # in seconds - logging: - logstash: # Forward logs to logstash over a socket, used by LoggingConfiguration - enabled: true - host: localhost - port: 5000 - queue-size: 512 - -# =================================================================== -# Application specific properties -# Add your own application properties here, see the ApplicationProperties class -# to have type-safe configuration, like in the JHipsterProperties above -# -# More documentation is available at: -# https://www.jhipster.tech/common-application-properties/ -# =================================================================== - -# application: diff --git a/src/main/resources/config/application-prod.yml b/src/main/resources/config/application-prod.yml index 6b55075a..07ec6305 100644 --- a/src/main/resources/config/application-prod.yml +++ b/src/main/resources/config/application-prod.yml @@ -13,7 +13,7 @@ # http://docs.spring.io/spring-boot/docs/current/reference/html/common-application-properties.html # =================================================================== -logging: +logging: level: ROOT: INFO org.assimbly.gateway: INFO @@ -34,7 +34,7 @@ spring: enabled: false datasource: type: com.zaxxer.hikari.HikariDataSource - url: jdbc:h2:file:./build/h2db/db/gateway;DB_CLOSE_DELAY=-1 + url: jdbc:h2:file:${user.home}/.assimbly/db/gateway;DB_CLOSE_DELAY=-1 username: gateway password: hikari: @@ -114,6 +114,7 @@ jhipster: enabled: false report-frequency: 60 # in seconds logging: + logstash: # Forward logs to logstash over a socket, used by LoggingConfiguration enabled: false host: localhost diff --git a/src/main/resources/config/application-prod.yml.old b/src/main/resources/config/application-prod.yml.old deleted file mode 100644 index 46c75fd1..00000000 --- a/src/main/resources/config/application-prod.yml.old +++ /dev/null @@ -1,133 +0,0 @@ -# =================================================================== -# Spring Boot configuration for the "prod" profile. -# -# This configuration overrides the application.yml file. -# -# More information on profiles: https://www.jhipster.tech/profiles/ -# More information on configuration properties: https://www.jhipster.tech/common-application-properties/ -# =================================================================== - -# =================================================================== -# Standard Spring Boot properties. -# Full reference is available at: -# http://docs.spring.io/spring-boot/docs/current/reference/html/common-application-properties.html -# =================================================================== - -logging: - level: - ROOT: INFO - org.assimbly.gateway: INFO - io.github.jhipster: INFO - -spring: - devtools: - restart: - enabled: false - livereload: - enabled: false - datasource: - type: com.zaxxer.hikari.HikariDataSource - url: jdbc:mysql://localhost:3306/gateway?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC - username: root - password: admin - hikari: - auto-commit: false - data-source-properties: - cachePrepStmts: true - prepStmtCacheSize: 250 - prepStmtCacheSqlLimit: 2048 - useServerPrepStmts: true - jpa: - database-platform: org.hibernate.dialect.MySQL5InnoDBDialect - database: MYSQL - show-sql: false - properties: - hibernate.id.new_generator_mappings: true - hibernate.connection.provider_disables_autocommit: true - hibernate.cache.use_second_level_cache: true - hibernate.cache.use_query_cache: false - hibernate.generate_statistics: false - hibernate.cache.region.factory_class: io.github.jhipster.config.jcache.BeanClassLoaderAwareJCacheRegionFactory - liquibase: - contexts: prod - mail: - host: localhost - port: 25 - username: - password: - thymeleaf: - cache: true - -# =================================================================== -# To enable TLS in production, generate a certificate using: -# keytool -genkey -alias gateway -storetype PKCS12 -keyalg RSA -keysize 2048 -keystore keystore.p12 -validity 3650 -# -# You can also use Let's Encrypt: -# https://maximilian-boehm.com/hp2121/Create-a-Java-Keystore-JKS-from-Let-s-Encrypt-Certificates.htm -# -# Then, modify the server.ssl properties so your "server" configuration looks like: -# -# server: -# port: 443 -# ssl: -# key-store: classpath:config/tls/keystore.p12 -# key-store-password: password -# key-store-type: PKCS12 -# key-alias: gateway -# # The ciphers suite enforce the security by deactivating some old and deprecated SSL cipher, this list was tested against SSL Labs (https://www.ssllabs.com/ssltest/) -# ciphers: TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 ,TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 ,TLS_DHE_RSA_WITH_AES_256_GCM_SHA384 ,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384,TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_RSA_WITH_AES_256_CBC_SHA256,TLS_DHE_RSA_WITH_AES_256_CBC_SHA,TLS_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_128_CBC_SHA256,TLS_RSA_WITH_AES_256_CBC_SHA256,TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA,TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA,TLS_RSA_WITH_CAMELLIA_256_CBC_SHA,TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA,TLS_RSA_WITH_CAMELLIA_128_CBC_SHA -# =================================================================== -server: - port: 8080 - compression: - enabled: true - mime-types: text/html,text/xml,text/plain,text/css, application/javascript, application/json - min-response-size: 1024 - -# =================================================================== -# JHipster specific properties -# -# Full reference is available at: https://www.jhipster.tech/common-application-properties/ -# =================================================================== - -jhipster: - http: - version: V_1_1 # To use HTTP/2 you will need SSL support (see above the "server.ssl" configuration) - cache: # Used by the CachingHttpHeadersFilter - timeToLiveInDays: 1461 - cache: # Cache configuration - ehcache: # Ehcache configuration - time-to-live-seconds: 3600 # By default objects stay 1 hour in the cache - max-entries: 1000 # Number of objects in each cache entry - security: - remember-me: - # security key (this key should be unique for your application, and kept secret) - key: 3ff0a5bceb965db5bcb77fecccd1ce908c269e49 - mail: # specific JHipster mail property, for standard properties see MailProperties - from: gateway@localhost - base-url: http://my-server-url-to-change # Modify according to your server's URL - metrics: # DropWizard Metrics configuration, used by MetricsConfiguration - jmx: - enabled: true - prometheus: - enabled: false #expose metrics via prometheus - logs: # Reports Dropwizard metrics in the logs - enabled: false - report-frequency: 60 # in seconds - logging: - logstash: # Forward logs to logstash over a socket, used by LoggingConfiguration - enabled: false - host: localhost - port: 5000 - queue-size: 512 - -# =================================================================== -# Application specific properties -# Add your own application properties here, see the ApplicationProperties class -# to have type-safe configuration, like in the JHipsterProperties above -# -# More documentation is available at: -# https://www.jhipster.tech/common-application-properties/ -# =================================================================== - -# application: diff --git a/src/main/resources/config/application.yml b/src/main/resources/config/application.yml index dfda97b9..3f93f3a9 100644 --- a/src/main/resources/config/application.yml +++ b/src/main/resources/config/application.yml @@ -99,7 +99,7 @@ info: # Full reference is available at: https://www.jhipster.tech/common-application-properties/ # =================================================================== -jhipster: +jhipster: async: core-pool-size: 4 max-pool-size: 50 @@ -144,6 +144,5 @@ application: gateway: name: default base-directory: default - hawtio: authenticationEnabled: false diff --git a/src/main/resources/config/liquibase/changelog/20180114132915_added_entity_Flow.xml b/src/main/resources/config/liquibase/changelog/20180114132915_added_entity_Flow.xml index 62ab6578..667151e2 100644 --- a/src/main/resources/config/liquibase/changelog/20180114132915_added_entity_Flow.xml +++ b/src/main/resources/config/liquibase/changelog/20180114132915_added_entity_Flow.xml @@ -55,12 +55,6 @@ - - - - - - diff --git a/src/main/resources/config/liquibase/changelog/20180114132915_added_entity_constraints_Flow.xml b/src/main/resources/config/liquibase/changelog/20180114132915_added_entity_constraints_Flow.xml index 7173d20d..5010997f 100644 --- a/src/main/resources/config/liquibase/changelog/20180114132915_added_entity_constraints_Flow.xml +++ b/src/main/resources/config/liquibase/changelog/20180114132915_added_entity_constraints_Flow.xml @@ -14,17 +14,5 @@ referencedColumnNames="id" referencedTableName="gateway"/> - - - - diff --git a/src/main/resources/config/liquibase/changelog/20200212091900_added_entity_constraints_Flow.xml b/src/main/resources/config/liquibase/changelog/20200212091900_added_entity_constraints_Flow.xml deleted file mode 100644 index 1f5b5f53..00000000 --- a/src/main/resources/config/liquibase/changelog/20200212091900_added_entity_constraints_Flow.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - diff --git a/src/main/resources/config/liquibase/master.xml b/src/main/resources/config/liquibase/master.xml index 78ae8b11..d8bdef5c 100644 --- a/src/main/resources/config/liquibase/master.xml +++ b/src/main/resources/config/liquibase/master.xml @@ -15,8 +15,9 @@ - + + @@ -25,15 +26,14 @@ - + + - - diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index 22c32fb4..19b8dc1a 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -6,10 +6,10 @@ - + ${user.home}/.assimbly/logs/%d{yyyy-MM-dd}.assimbly.log - 90 - 20GB + 30 + 10GB utf-8 diff --git a/src/main/webapp/app/entities/flow/flow-edit-all.component.ts b/src/main/webapp/app/entities/flow/flow-edit-all.component.ts index 5c0b6f39..74da48bd 100644 --- a/src/main/webapp/app/entities/flow/flow-edit-all.component.ts +++ b/src/main/webapp/app/entities/flow/flow-edit-all.component.ts @@ -257,12 +257,12 @@ export class FlowEditAllComponent implements OnInit, OnDestroy { (this.editFlowForm.controls.endpointsData).insert(index, formgroup); this.getOptions( - this.endpoint, - this.editFlowForm.controls.endpointsData.get((index).toString()), - this.endpointsOptions[index] + this.endpoint, + this.editFlowForm.controls.endpointsData.get((index).toString()), + this.endpointsOptions[index] ); - - this.setTypeLinks(endpoint, index); + + this.setTypeLinks(this.endpoint, index); index = index + 1; }, this); @@ -339,8 +339,6 @@ export class FlowEditAllComponent implements OnInit, OnDestroy { } - - clone() { //reset id and flow name to null this.flow.id = null; @@ -584,6 +582,7 @@ export class FlowEditAllComponent implements OnInit, OnDestroy { } getOptions(endpoint: any, endpointForm: any, endpointOptions: Array