mirror of
https://github.com/status-im/open-bounty.git
synced 2025-02-05 14:13:26 +00:00
Merge pull request #217 from pablodip/develop-merge-master
Update develop with master
This commit is contained in:
commit
62555ec144
20
README.md
20
README.md
@ -20,6 +20,26 @@ The `develop` branch is automatically deployed here.
|
||||
You will need [Leiningen](https://github.com/technomancy/leiningen) 2.0 or above installed.
|
||||
|
||||
### PostgreSQL
|
||||
<<<<<<< HEAD
|
||||
|
||||
Make sure you install [PostgreSQL](https://www.postgresql.org/) and properly set it up:
|
||||
|
||||
```
|
||||
sudo -u postgres psql -c "CREATE USER commiteth WITH PASSWORD 'commiteth';"
|
||||
sudo -u postgres createdb commiteth
|
||||
```
|
||||
|
||||
## Running
|
||||
|
||||
Launch following commands each in its own shell:
|
||||
|
||||
```
|
||||
lein run
|
||||
lein figwheel
|
||||
lein less auto
|
||||
```
|
||||
|
||||
=======
|
||||
|
||||
Make sure you install [PostgreSQL](https://www.postgresql.org/) and properly set it up:
|
||||
|
||||
|
File diff suppressed because one or more lines are too long
@ -53,8 +53,8 @@
|
||||
new-user?)
|
||||
(try
|
||||
(hubspot/create-hubspot-contact (:email user)
|
||||
(:name user "")
|
||||
(:login user))
|
||||
(:name user "")
|
||||
(:login user))
|
||||
(catch Throwable t
|
||||
(log/error "Failed to create hubspot contact" t))))
|
||||
(assoc (found (str (env :server-address) "/app"))
|
||||
|
@ -312,12 +312,13 @@
|
||||
|
||||
(defn wrap-in-try-catch [func]
|
||||
(try
|
||||
(func)
|
||||
(catch Throwable t
|
||||
(log/error t))))
|
||||
|
||||
(defn run-tasks [tasks]
|
||||
(doall
|
||||
(map (fn [func] (wrap-in-try-catch (func)))
|
||||
(map (fn [func] (wrap-in-try-catch func))
|
||||
tasks)))
|
||||
|
||||
(defn run-1-min-interval-tasks [time]
|
||||
|
Loading…
x
Reference in New Issue
Block a user