Make number of rolling logfiles configurable

Author: boyter

README.md

@@ -120,15 +120,15 @@ XX XXXXXXX XXXX - 1.3.3
  - White/Black list of file extensions
  - Fix bug where OWASP results not escaped
  - Add logout button to admin sections
- - Refactor JavaScript and remove bugs
+ - Refactor JavaScript and fix bugs
  - Additional properties for controlling background threads
  - Fix off by 1 error where some results would not be shown
  - Admin can now selectively pause indexing
  - Ability to log out all indexed and excluded files to CSV
- - Set file rotation to have 10x10mb files
+ - Set file rotation to have 10x10mb files by default but controlled through property
  - Add backoff setting to settings page to control CPU usage
  - Improve memory usage for large file repositories
- - Whitelist now trumps minified
+ - Whitelist trumps minified logic
 
 04 October 2016 - 1.3.2
  - Improve matching of certain strings such as E.G. linux2.7.4 or i386

searchcode.properties.example

@@ -13,6 +13,7 @@ only_localhost=false
 low_memory=false
 log_level=SEVERE
 log_path=./logs
+log_count=10
 spelling_corrector_size=10000
 max_document_queue_size=1000
 max_document_queue_line_size=100000

src/main/java/com/searchcode/app/config/Values.java

@@ -80,6 +80,10 @@ public class Values {
     public static String DEFAULT_AND_MATCH = "true";
     public static String LOG_INDEXED = "log_indexed";
     public static String DEFAULT_LOG_INDEXED = "false";
+    public static String LOG_COUNT = "log_count";
+    public static String DEFAULT_LOG_COUNT = "10";
+    public static String LOG_LEVEL = "log_level";
+    public static String DEFAULT_LOG_LEVEL = "SEVERE";
 
     // Lucene stored values for indexing / searching
     public static String CONTENTS = "contents";

src/main/java/com/searchcode/app/util/LoggerWrapper.java

@@ -28,30 +28,25 @@
 public class LoggerWrapper {
 
     private Logger logger = null;
-
     private EvictingQueue allCache = null;
-
     private EvictingQueue infoRecentCache = null;
-
     private EvictingQueue warningRecentCache = null;
-
     private EvictingQueue severeRecentCache = null;
-
     private EvictingQueue searchLog = null;
 
     public int BYTESLOGSIZE = 10 * 1024 * 1024;
-
     public int LOGCOUNT = 10;
 
     public LoggerWrapper() {
+        this.LOGCOUNT = Helpers.tryParseInt((String)Properties.getProperties().getOrDefault(Values.LOG_COUNT, Values.DEFAULT_LOG_COUNT), Values.DEFAULT_LOG_COUNT);
+
         String path = Values.EMPTYSTRING;
         try {
             path = Helpers.getLogPath();
-
             path += "searchcode-server-%g.log";
             Handler handler = new FileHandler(path, this.BYTESLOGSIZE, this.LOGCOUNT);
 
-            String logLevel = (String) Properties.getProperties().getOrDefault("log_level", "severe");
+            String logLevel = (String)Properties.getProperties().getOrDefault(Values.LOG_LEVEL, Values.DEFAULT_LOG_LEVEL);
 
             handler.setFormatter(new SimpleFormatter());
 

src/main/resources/spark/template/freemarker/documentation.ftl

@@ -569,6 +569,8 @@ print data['sucessful'], data['message']</textarea>
               <dd>If you enable use_system_git you need to ensure that this equals the path to your git executable for your system. By default set to /usr/bin/git</dd>
               <dt>log_level</dt>
               <dd>What level of logging is requested both to STDOUT and the default log file. Accepts the uppercase values of INFO, WARNING, SEVERE or OFF. By default set to SEVERE. Critical warnings will still be printed to STDOUT.</dd>
+              <dt>log_count</dt>
+              <dd>How many rolling log files to keep. By default set to 10.</dd>
               <dt>api_enabled</dt>
               <dd>Boolean value true or false. Should the searchcode server API be enabled. By default set to false.</dd>
               <dt>api_key_authentication</dt>