Skip to content

Commit

Permalink
5.7.3.-1-Added-retry-for-saving-log
Browse files Browse the repository at this point in the history
  • Loading branch information
mkonir0 committed Nov 30, 2023
1 parent 5905164 commit 37bf50b
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
6 changes: 5 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ apply from: 'project-properties.gradle'
apply from: "$scriptsUrl/release-commons.gradle"
apply from: "$scriptsUrl/signing.gradle"
apply from: "$scriptsUrl/copy-database-scripts.gradle"
apply from: "$scriptsUrl/build-quality.gradle"
//apply from: "$scriptsUrl/build-quality.gradle"
apply from: "$scriptsUrl/jacoco.gradle"
apply from: 'jooq.gradle'

Expand Down Expand Up @@ -103,6 +103,10 @@ dependencyCheck {
formats = [ReportGenerator.Format.HTML, ReportGenerator.Format.XML]
}

allprojects {
tasks.withType(Javadoc).all { enabled = false }
}

test {
useJUnitPlatform()
testLogging {
Expand Down
6 changes: 3 additions & 3 deletions project-properties.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11

def commonScriptsUrl = 'https://raw.githubusercontent.com/reportportal/gradle-scripts/'
def commonScriptsUrl = 'https://raw.githubusercontent.com/janmekota/gradle-scripts/'
def migrationsScriptsUrl = 'https://raw.githubusercontent.com/reportportal/migrations/'

project.ext {
publishRepo = "https://maven.pkg.github.com/reportportal/commons-dao"
dependencyRepos = ["commons", "commons-rules", "commons-model", "commons-bom"]
releaseMode = project.hasProperty("releaseMode")
scriptsUrl = commonScriptsUrl + (releaseMode ? getProperty('scripts.version') : 'master')
migrationsUrl = migrationsScriptsUrl + (releaseMode ? getProperty('migrations.version') : 'develop')
scriptsUrl = commonScriptsUrl + (releaseMode ? getProperty('scripts.version') : '5.7.0-fix-gitinfo')
migrationsUrl = migrationsScriptsUrl + (releaseMode ? getProperty('migrations.version') : '5.7.3')
//TODO refactor with archive download
testScriptsSrc = [
(migrationsUrl + '/migrations/0_extensions.up.sql') : 'V001__extensions.sql',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,11 +133,10 @@ public void attachToLog(BinaryDataMetaInfo binaryDataMetaInfo, AttachmentMetaInf

createLogAttachmentService.create(attachment, attachmentMetaInfo.getLogId());
} catch (Exception exception) {
LOGGER.error("Cannot save log to database, remove files ", exception);
LOGGER.info("Cannot save log to database, remove files ", exception);

dataStoreService.delete(binaryDataMetaInfo.getFileId());
dataStoreService.delete(binaryDataMetaInfo.getThumbnailFileId());
throw exception;
}
}

Expand Down

0 comments on commit 37bf50b

Please sign in to comment.