Skip to content
This repository was archived by the owner on Nov 27, 2018. It is now read-only.

Commit b41fc5b

Browse files
committed
updates
1 parent 081fec2 commit b41fc5b

23 files changed

+827
-1980
lines changed

.gitignore

+6
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,14 @@
33
/app/logs/*
44
!app/cache/.gitkeep
55
!app/logs/.gitkeep
6+
!bin/sidekiq
7+
!bin/sidekiq-web
68

79
# Cache and logs (Symfony3)
810
/var/cache/*
911
/var/logs/*
12+
/var/sessions/*
13+
/var/pids/*
1014
!var/cache/.gitkeep
1115
!var/logs/.gitkeep
1216

@@ -33,3 +37,5 @@
3337
# Build data
3438
/build/
3539
.idea
40+
41+
.bundle

.ruby-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.2.2
1+
2.4.0

Gemfile

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
source 'https://rubygems.org'
22

33
# Workers
4-
gem 'sinatra'
4+
gem 'algorithms'
5+
gem 'tilt'
6+
gem 'statsd-ruby'
7+
gem 'redis-namespace'
58
gem 'sidekiq'
6-
gem "sidekiq-cron"
7-
gem 'sidekiq_monitor'
8-
gem 'redis'
9+
source "https://enterprise.contribsys.com/" do
10+
gem 'sidekiq-ent'
11+
end
12+
gem 'sidekiq-statistic'
913
gem 'sidekiq-limit_fetch'

Gemfile.lock

+27-104
Original file line numberDiff line numberDiff line change
@@ -1,123 +1,46 @@
11
GEM
22
remote: https://rubygems.org/
3+
remote: https://enterprise.contribsys.com/
34
specs:
4-
actionpack (4.2.6)
5-
actionview (= 4.2.6)
6-
activesupport (= 4.2.6)
7-
rack (~> 1.6)
8-
rack-test (~> 0.6.2)
9-
rails-dom-testing (~> 1.0, >= 1.0.5)
10-
rails-html-sanitizer (~> 1.0, >= 1.0.2)
11-
actionview (4.2.6)
12-
activesupport (= 4.2.6)
13-
builder (~> 3.1)
14-
erubis (~> 2.7.0)
15-
rails-dom-testing (~> 1.0, >= 1.0.5)
16-
rails-html-sanitizer (~> 1.0, >= 1.0.2)
17-
activesupport (4.2.6)
18-
i18n (~> 0.7)
19-
json (~> 1.7, >= 1.7.7)
20-
minitest (~> 5.1)
21-
thread_safe (~> 0.3, >= 0.3.4)
22-
tzinfo (~> 1.1)
23-
builder (3.2.2)
24-
concurrent-ruby (1.0.2)
25-
connection_pool (2.2.0)
26-
erubis (2.7.0)
27-
i18n (0.7.0)
28-
jquery-datatables-rails (3.4.0)
29-
actionpack (>= 3.1)
30-
jquery-rails
31-
railties (>= 3.1)
32-
sass-rails
33-
jquery-rails (4.1.1)
34-
rails-dom-testing (>= 1, < 3)
35-
railties (>= 4.2.0)
36-
thor (>= 0.14, < 2.0)
37-
json (1.8.3)
38-
loofah (2.0.3)
39-
nokogiri (>= 1.5.9)
40-
mini_portile2 (2.0.0)
41-
minitest (5.8.4)
42-
nokogiri (1.6.7.2)
43-
mini_portile2 (~> 2.0.0.rc2)
44-
rack (1.6.4)
5+
algorithms (0.6.1)
6+
concurrent-ruby (1.0.5)
7+
connection_pool (2.2.1)
8+
rack (2.0.1)
459
rack-protection (1.5.3)
4610
rack
47-
rack-test (0.6.3)
48-
rack (>= 1.0)
49-
rails-datatables (0.0.2)
50-
rails-deprecated_sanitizer (1.0.3)
51-
activesupport (>= 4.2.0.alpha)
52-
rails-dom-testing (1.0.7)
53-
activesupport (>= 4.2.0.beta, < 5.0)
54-
nokogiri (~> 1.6.0)
55-
rails-deprecated_sanitizer (>= 1.0.1)
56-
rails-html-sanitizer (1.0.3)
57-
loofah (~> 2.0)
58-
railties (4.2.6)
59-
actionpack (= 4.2.6)
60-
activesupport (= 4.2.6)
61-
rake (>= 0.8.7)
62-
thor (>= 0.18.1, < 2.0)
63-
rake (11.1.2)
64-
redis (3.3.0)
65-
redis-namespace (1.5.2)
11+
redis (3.3.3)
12+
redis-namespace (1.5.3)
6613
redis (~> 3.0, >= 3.0.4)
67-
rufus-scheduler (3.2.1)
68-
sass (3.4.22)
69-
sass-rails (5.0.4)
70-
railties (>= 4.0.0, < 5.0)
71-
sass (~> 3.1)
72-
sprockets (>= 2.8, < 4.0)
73-
sprockets-rails (>= 2.0, < 4.0)
74-
tilt (>= 1.1, < 3)
75-
sidekiq (4.1.2)
14+
sidekiq (4.2.9)
7615
concurrent-ruby (~> 1.0)
7716
connection_pool (~> 2.2, >= 2.2.0)
17+
rack-protection (>= 1.5.0)
7818
redis (~> 3.2, >= 3.2.1)
79-
sidekiq-cron (0.4.2)
80-
redis-namespace (>= 1.5.2)
81-
rufus-scheduler (>= 2.0.24)
82-
sidekiq (>= 4.0.0)
83-
sidekiq-limit_fetch (3.1.0)
19+
sidekiq-ent (1.5.2)
20+
algorithms
21+
sidekiq (>= 4.2.9)
22+
sidekiq-pro (>= 3.4.1)
23+
sidekiq-limit_fetch (3.4.0)
8424
sidekiq (>= 4)
85-
sidekiq_monitor (0.1.7)
86-
jquery-datatables-rails (>= 2.1.10.0.2)
87-
rails-datatables
88-
sidekiq (>= 2.2.1)
89-
slim
90-
sinatra (1.4.7)
91-
rack (~> 1.5)
92-
rack-protection (~> 1.4)
93-
tilt (>= 1.3, < 3)
94-
slim (3.0.6)
95-
temple (~> 0.7.3)
96-
tilt (>= 1.3.3, < 2.1)
97-
sprockets (3.6.0)
98-
concurrent-ruby (~> 1.0)
99-
rack (> 1, < 3)
100-
sprockets-rails (3.0.4)
101-
actionpack (>= 4.0)
102-
activesupport (>= 4.0)
103-
sprockets (>= 3.0.0)
104-
temple (0.7.6)
105-
thor (0.19.1)
106-
thread_safe (0.3.5)
107-
tilt (2.0.2)
108-
tzinfo (1.2.2)
109-
thread_safe (~> 0.1)
25+
sidekiq-pro (3.4.5)
26+
sidekiq (>= 4.1.5)
27+
sidekiq-statistic (1.2.0)
28+
sidekiq (>= 3.3.4, < 5)
29+
statsd-ruby (1.3.0)
30+
tilt (2.0.6)
11031

11132
PLATFORMS
11233
ruby
11334

11435
DEPENDENCIES
115-
redis
36+
algorithms
37+
redis-namespace
11638
sidekiq
117-
sidekiq-cron
39+
sidekiq-ent!
11840
sidekiq-limit_fetch
119-
sidekiq_monitor
120-
sinatra
41+
sidekiq-statistic
42+
statsd-ruby
43+
tilt
12144

12245
BUNDLED WITH
123-
1.12.3
46+
1.14.6

app/AppKernel.php

+14-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
<?php
22

3-
use Symfony\Component\HttpKernel\Kernel;
43
use Symfony\Component\Config\Loader\LoaderInterface;
54

6-
class AppKernel extends Kernel
5+
class AppKernel extends \Symfony\Component\HttpKernel\Kernel
76
{
87
public function registerBundles()
98
{
@@ -12,8 +11,6 @@ public function registerBundles()
1211
new Symfony\Bundle\SecurityBundle\SecurityBundle(),
1312
new Symfony\Bundle\TwigBundle\TwigBundle(),
1413
new Symfony\Bundle\MonologBundle\MonologBundle(),
15-
new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(),
16-
new Symfony\Bundle\AsseticBundle\AsseticBundle(),
1714
new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
1815
new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
1916

@@ -31,6 +28,19 @@ public function registerBundles()
3128
return $bundles;
3229
}
3330

31+
public function getRootDir()
32+
{
33+
return __DIR__;
34+
}
35+
public function getCacheDir()
36+
{
37+
return dirname(__DIR__).'/var/cache/'.$this->getEnvironment();
38+
}
39+
public function getLogDir()
40+
{
41+
return dirname(__DIR__).'/var/logs';
42+
}
43+
3444
public function registerContainerConfiguration(LoaderInterface $loader)
3545
{
3646
$loader->load($this->getRootDir().'/config/config_'.$this->getEnvironment().'.yml');

0 commit comments

Comments
 (0)