Skip to content

Commit

Permalink
#20507 config defaults for 21.05.1 (#20508)
Browse files Browse the repository at this point in the history
  • Loading branch information
wezell authored Jun 8, 2021
1 parent 57ca35b commit 2f8f9db
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ public static <R> DotKeyLockManager <R> newLockManager(final String lockManagerN
return dotKeyLockManagerFactory.create(lockManagerName);
}

final int stripes = Config.getIntProperty(lockManagerName + DOTCMS_CONCURRENT_LOCK_STRIPES, StripedLockImpl.DEFAULT_STRIPES);
final int stripes = Config.getIntProperty(lockManagerName + DOTCMS_CONCURRENT_LOCK_STRIPES,
Config.getIntProperty(DOTCMS_CONCURRENT_LOCK_STRIPES,StripedLockImpl.DEFAULT_STRIPES));
final int time = Config.getIntProperty(lockManagerName + DOTCMS_CONCURRENT_LOCK_STRIPES_TIME, StripedLockImpl.DEFAULT_TIME);
final TimeUnit timeUnit = TimeUnit.valueOf(Config.getStringProperty(lockManagerName + DOTCMS_CONCURRENT_LOCK_STRIPES_TIMEUNIT, StripedLockImpl.DEFAULT_TU.name()));
return new StripedLockImpl<>(stripes, time, timeUnit);
Expand Down
8 changes: 8 additions & 0 deletions dotCMS/src/main/resources/dotmarketing-config.properties
Original file line number Diff line number Diff line change
Expand Up @@ -919,3 +919,11 @@ api.cors.default.Access-Control-Expose-Headers=*
# "shared", means that transformed images will be written and read from the shared /assets/dotGenerated folder, which generally lives on an NFS mount.
# "local" means the generated/transformed images will be written and read to the local, e.g. /dotSecure/dotGenerated folder.
DOTGENERATED_DEFAULT_PATH=shared


## Update the default number of available stripes
dotcms.concurrent.locks.stripes=1024

## DotConcurrency
# this updates the default queue capacity to Integer.max, which is default for any new queue
dotcms.concurrent.queuecapacity=2147483647

0 comments on commit 2f8f9db

Please sign in to comment.