Merge pull request #14 from drbobbeaty/regex

Fixed up the regex on files

Author: Aaron Crow

project.clj

@@ -4,7 +4,7 @@
             :url "http://www.eclipse.org/legal/epl-v10.html"}
   :dependencies [[com.taoensso/nippy "2.8.0"]
                  [primitive-math "0.1.4"]
-                 [byte-streams "0.2.0"]]
+                 [byte-streams "0.2.2"]]
   :profiles {:dev {:dependencies [[org.clojure/clojure "1.5.1"]
                                   [criterium "0.4.3"]
                                   [codox-md "0.2.0" :exclusions [org.clojure/clojure]]]}}

src/durable_queue.clj

@@ -348,7 +348,7 @@
    any existing files for that queue name."
   ([directory q-name queue size]
      (locking fs-monitor
-       (let [pattern (re-pattern (str "^" q-name "_(\\d+)"))
+       (let [pattern (re-pattern (str "^" q-name "_(\\d{6}$)"))
              last-number (->> directory
                            io/file
                            .listFiles
@@ -398,8 +398,8 @@
   (let [queue->file (->> directory
                       io/file
                       .listFiles
-                      (filter #(re-find #"\w+_\d+" (.getName ^File %)))
-                      (group-by #(second (re-find #"(\w+)_\d+" (.getName ^File %)))))]
+                      (filter #(re-find #"^\w+_\d{6}$" (.getName ^File %)))
+                      (group-by #(second (re-find #"^(\w+)_\d{6}$" (.getName ^File %)))))]
     (zipmap
       (keys queue->file)
       (map