backend/rhn-conf/rhn.conf | 6 ----- java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java | 12 +++++------ 2 files changed, 6 insertions(+), 12 deletions(-)
New commits: commit c6e25a418fbf0f29f17f3db4797ab766c90cc951 Author: Tomas Lestach tlestach@redhat.com Date: Wed Aug 17 16:15:37 2011 +0200
658533 - remove default currency from backend part of rhn.conf
and take over the defaults to the code
diff --git a/backend/rhn-conf/rhn.conf b/backend/rhn-conf/rhn.conf index 5e563de..a257157 100644 --- a/backend/rhn-conf/rhn.conf +++ b/backend/rhn-conf/rhn.conf @@ -13,9 +13,3 @@ log_file = /var/log/rhn/rhn.log
enable_snapshots = 1
-sc.crit = 32 -sc.imp = 16 -sc.mod = 8 -sc.low = 4 -sc.bug = 2 -sc.enh = 1 diff --git a/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java b/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java index 6b0fa12..3e5401d 100644 --- a/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java +++ b/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java @@ -186,7 +186,7 @@ public class ConfigDefaults { * @return the System Currency multiplier for critical security errata */ public Integer getSCCrit() { - return Config.get().getInt(SYSTEM_CURRENCY_CRIT); + return Config.get().getInt(SYSTEM_CURRENCY_CRIT, 32); }
/** @@ -194,7 +194,7 @@ public class ConfigDefaults { * @return the System Currency multiplier for important security errata */ public Integer getSCImp() { - return Config.get().getInt(SYSTEM_CURRENCY_IMP); + return Config.get().getInt(SYSTEM_CURRENCY_IMP, 16); }
/** @@ -202,7 +202,7 @@ public class ConfigDefaults { * @return the System Currency multiplier for moderate security errata */ public Integer getSCMod() { - return Config.get().getInt(SYSTEM_CURRENCY_MOD); + return Config.get().getInt(SYSTEM_CURRENCY_MOD, 8); }
/** @@ -210,7 +210,7 @@ public class ConfigDefaults { * @return the System Currency multiplier for low security errata */ public Integer getSCLow() { - return Config.get().getInt(SYSTEM_CURRENCY_LOW); + return Config.get().getInt(SYSTEM_CURRENCY_LOW, 4); }
/** @@ -218,7 +218,7 @@ public class ConfigDefaults { * @return the System Currency multiplier for bug fix errata */ public Integer getSCBug() { - return Config.get().getInt(SYSTEM_CURRENCY_BUG); + return Config.get().getInt(SYSTEM_CURRENCY_BUG, 2); }
/** @@ -226,7 +226,7 @@ public class ConfigDefaults { * @return the System Currency multiplier for enhancement errata */ public Integer getSCEnh() { - return Config.get().getInt(SYSTEM_CURRENCY_ENH); + return Config.get().getInt(SYSTEM_CURRENCY_ENH, 1); }
/**
spacewalk-commits@lists.fedorahosted.org