Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CollinScripts, Collins Actions, List Headers, oh my! #39

Closed
wants to merge 1,330 commits into from
Closed

CollinScripts, Collins Actions, List Headers, oh my! #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1330 commits
Select commit Hold shift + click to select a range
65d3dd6
replacing Asset.find with Solr searching
Aug 15, 2012
363c87b
fixing AssetSearchParameters solr serialization
Aug 16, 2012
a44f2eb
adding sort field to routes, totally encapsulated solr key lookup
Aug 16, 2012
03e42df
allowing key aliases for api support, working on unit tests passing
Aug 16, 2012
41b797e
solr range, date fixes
Aug 17, 2012
7a4e208
quoting string values, fixing date ranges
Aug 17, 2012
7419dc1
new version router for routing based on API version
Aug 17, 2012
ca0e852
adding support for default version routing
Aug 17, 2012
6ee5547
switching router to use ADT, partial functions
Aug 17, 2012
1e10a26
adding version routing to get/assets
Aug 17, 2012
253704c
switching from PartialFunction to Function1 for exhaustive matches
Aug 17, 2012
e5cef3a
fixing tests
Aug 17, 2012
ab6c8c5
fixing bugs with empty queries
Aug 22, 2012
69af7ac
duh, don't search solr to re-index solr
Aug 22, 2012
49b5c27
Ugh, need to reset these creds now
bmatheny Aug 26, 2012
f9d0183
Not sure how this has ever worked
bmatheny Aug 26, 2012
33b9f41
Adding solrdata to gitignore
bmatheny Aug 26, 2012
01f7703
Fixed comma separated headers and added API support to client
bmatheny Aug 26, 2012
c842990
Started namespace cleanup and config refactor. Need to fix tests afte…
bmatheny Aug 26, 2012
deac2b2
removing version routing from asset find api
Aug 27, 2012
b1ddb53
cleaning up error handling of invalid versions
Aug 28, 2012
0f21ef5
Play upgrade, dynamic detection of config classes
bmatheny Aug 28, 2012
f0605ac
Support for delaying initial file watch trigger
bmatheny Aug 28, 2012
f635563
Bit of logging
bmatheny Aug 28, 2012
8ba879e
fixing sorting in the web view
Aug 29, 2012
ba9f28f
converting sort direction from enum to ADT
Aug 29, 2012
0daf8cf
polymorphic PageParams constructor, type fixes
Aug 29, 2012
4a7d521
case insensitive sort parsing, fix tests
Aug 29, 2012
9eaaa72
Initial version of change detection for configs
bmatheny Aug 30, 2012
850c2e3
sort direction toggling working
Aug 30, 2012
75ec8de
Deleted Feature and refactored
bmatheny Aug 30, 2012
b24f7d1
Power management uses Configurable
bmatheny Aug 30, 2012
ac8a7f6
Deleted Config class, started refactoring
bmatheny Aug 31, 2012
f63308b
Finished first batch of fixes, next one coming
bmatheny Aug 31, 2012
ed9abc4
Code now cleanly compiles, now to fix tests
bmatheny Aug 31, 2012
3376a06
Tests now compile, now to get them to pass
bmatheny Aug 31, 2012
a7c245f
All tests passing
bmatheny Sep 1, 2012
2ca4341
Bit of cleanup
bmatheny Sep 1, 2012
d1fa618
Started killing refs to Configuration
bmatheny Sep 1, 2012
9d92d45
Renaming internal Configuration classes to Config
bmatheny Sep 1, 2012
2acc622
Fixed tests
bmatheny Sep 1, 2012
74ef9be
Hide dirty usage of Typesafe/Play config
bmatheny Sep 1, 2012
b3c310c
Moved decorator code to use new configs
bmatheny Sep 1, 2012
7ea119b
Minor fixes for prod
bmatheny Sep 1, 2012
e8ef740
Stop using FileWatcher in ConfigWatch
bmatheny Sep 1, 2012
aa75830
Cleaned up remaining auth cruft
bmatheny Sep 1, 2012
97ca587
Moved same config stuff into dev_base
bmatheny Sep 1, 2012
5ad6743
Runs in production mode as well now
bmatheny Sep 1, 2012
e85e782
Need permissions to be defs in case they change
bmatheny Sep 1, 2012
9c6a497
Cleaned up reference configs a bit
bmatheny Sep 2, 2012
d20f1b0
Moved solr plugin to use new config stuff
bmatheny Sep 2, 2012
368a42a
Remove some single use methods
bmatheny Sep 2, 2012
150597f
Moved callback plugin into main source
bmatheny Sep 2, 2012
b747db8
Allow callback commands to be specified as lists or strings
bmatheny Sep 2, 2012
a67d849
Version bump to 0.2.2
bmatheny Sep 2, 2012
ff55d62
Make sure plugins can work with the config system
bmatheny Sep 2, 2012
f258db6
CallbackManagerPlugin needs pluginInitialize as well
bmatheny Sep 2, 2012
006ff13
Cleaning up some namespacing
bmatheny Sep 2, 2012
6ae15e7
Moving file into correct package path
bmatheny Sep 2, 2012
663018a
Broke solr classes out into files
bmatheny Sep 2, 2012
6cf6885
Upgrading to play 2.0.3
bmatheny Sep 2, 2012
afeb410
SolrPlugin looks like it isn't draining, I'm wondering if removeAll i…
bmatheny Sep 2, 2012
905bef4
Updating README to point at play 2.0.3
bmatheny Sep 2, 2012
0a44c08
Bug fixes
bmatheny Sep 2, 2012
f2e6d51
Assets can come back to life and should be indexed.
bmatheny Sep 2, 2012
b551fa0
Heap dump if OOM
bmatheny Sep 2, 2012
2946606
Closes #3 - try and log runtime errors against an appropriate asset
bmatheny Sep 3, 2012
21e9dac
Moved common reflection stuff to MethodInvoker
bmatheny Sep 3, 2012
9112363
Pulled common reflection code from callback package into reflection p…
bmatheny Sep 3, 2012
cdf668e
Resolving merge conflicts after config refactor. Code compiles, tests…
bmatheny Sep 3, 2012
ae9c2c2
Pulled Cache plugin into collins package
bmatheny Sep 4, 2012
21e598c
Using java.lang.Integer so we don't end up with an int
bmatheny Sep 4, 2012
df363ea
Moved permissions code into collins package
bmatheny Sep 4, 2012
c9e901d
Getting ready to throw out file watcher in favor of just using the gu…
bmatheny Sep 4, 2012
69b65c4
Killed old FileWatcher code in favor of using a guava loading cache. …
bmatheny Sep 4, 2012
60d4599
Moved provisioning code into collins package
bmatheny Sep 4, 2012
77198d2
adding new frontend query logging to capture search querystrings
Sep 5, 2012
12fa0fe
Cleaned up provisioning plugin
bmatheny Sep 5, 2012
cd4ddc9
Adding official support (upstream) for the snakeyaml patch I submitted
bmatheny Sep 5, 2012
764ed86
Cleaned up configs a bit
bmatheny Sep 6, 2012
c28d512
Merge pull request #10 from tumblr/api-query-logging
bmatheny Sep 6, 2012
771df30
Pulled remaining plugins into collins package
bmatheny Sep 6, 2012
d8dd43f
Merge branch 'master' into plugin_cleanup
bmatheny Sep 6, 2012
21500da
Moved Provisioner and SoftLayer util plugins into util.plugins
bmatheny Sep 6, 2012
70ab147
Finished plugin renaming. Will also want to move Solr/Ipmi plugins af…
bmatheny Sep 6, 2012
3fc9a70
Log to STDOUT and MULTIPLEX
bmatheny Sep 6, 2012
754682a
Cleaned up reference/dev configs
bmatheny Sep 6, 2012
1dc142b
Equals, not colon
bmatheny Sep 6, 2012
f44f0e1
frontend query logging uses info level instead of debug
Sep 6, 2012
00c7b33
Adding the first, mostly working take on integrating a scripting engi…
Sep 6, 2012
02879cd
creating some tests to verify results of find requests
Sep 6, 2012
0bd8d98
working on find tests
Sep 6, 2012
a9fc911
Prepping code for supporting reintake re #12
bmatheny Sep 6, 2012
0b885e5
filling in tests
Sep 6, 2012
8ade9ea
A few more iterations towards working
Sep 6, 2012
85384bd
Stop doing adhoc JSON formatting
bmatheny Sep 8, 2012
87c80d8
Removing empty file
bmatheny Sep 8, 2012
da5d554
Only allow SL server assets to be activated. Closes #13
bmatheny Sep 8, 2012
aaab699
Implemented delete support, closes #4
bmatheny Sep 8, 2012
a95fe80
Provisioner profiles should reload after change
bmatheny Sep 8, 2012
dfe7ad9
Detect whether unlimited strength JCE is available
bmatheny Sep 8, 2012
444b6d2
Moved ConfigWatchTask into separate file
bmatheny Sep 8, 2012
9accb08
Ip Address pools are now hot reloadable, closes #9
bmatheny Sep 8, 2012
89f571a
Initial population of list directory
Sep 9, 2012
a9344c2
UI upgrades - bootstrap 2, jquery 1.8.1, DT 1.9.3
bmatheny Sep 9, 2012
216b410
Merge pull request #36 from tumblr/upgrade_bootstrap
bmatheny Sep 9, 2012
bae8019
Trying out side by side for search page
bmatheny Sep 10, 2012
c453f0a
Ensuring pages pass W3C validation
bmatheny Sep 10, 2012
f3247c7
Missing tr in table
bmatheny Sep 10, 2012
b96737c
Use default field sizes for date selectors
bmatheny Sep 10, 2012
6cc34c5
using sonatype repo for snakeyaml dependency
Sep 10, 2012
c856ebc
fixing bug where string values starting with "-" crashed solr
Sep 10, 2012
771978b
Merge pull request #38 from tumblr/fix-snakeyaml-dependency
DanSimon Sep 11, 2012
b6da04e
Introducing state attribute for asset
bmatheny Sep 11, 2012
0ad5b9f
Search on state, plus help page
bmatheny Sep 11, 2012
ff3dfc9
Make state a required field for in and out of maintenance
bmatheny Sep 11, 2012
ce64252
Initial commit of CollinScript scripting system and refactoring of Co…
Sep 11, 2012
fbba3b0
Merge branch 'master' into steve-configurable-headers
Sep 11, 2012
0dff006
Added callback support for working with states
bmatheny Sep 11, 2012
b29b32f
Fixed a regression
bmatheny Sep 11, 2012
b8318aa
Merge branch 'master' of github.com:tumblr/collins
bmatheny Sep 11, 2012
70f52b1
Prod logger should not use DEBUG
bmatheny Sep 11, 2012
04c2e55
collins-client support for asset state, along with JSON fix for descr…
bmatheny Sep 11, 2012
df7f862
Version bump to 0.2.3
bmatheny Sep 11, 2012
5e82bda
collins-client gemspec 0.2.3
bmatheny Sep 11, 2012
9c4cec6
Version bump to 0.2.12
bmatheny Sep 12, 2012
eadeb96
Collins shell support for displaying state information
bmatheny Sep 12, 2012
b5a8a12
Version bump to 0.2.7
bmatheny Sep 12, 2012
aa8f819
Updated collins-state gem
bmatheny Sep 12, 2012
2e3f074
Committing a working version of the action refactor in tandem with Co…
Sep 12, 2012
99d2201
Started implementing state creation endpoint
bmatheny Sep 12, 2012
7cf0f94
Fixing issue with status updates, need to refactor the partialUpdate …
bmatheny Sep 12, 2012
f4cda84
Finished state create API endpoint, need to do client implementation …
bmatheny Sep 12, 2012
c853729
Delete state support
bmatheny Sep 12, 2012
52a3b56
Merge branch 'master' into finder-tests
Sep 12, 2012
fccac49
adding stripped-down snapshot of collins db for rspec tests
Sep 12, 2012
cb82430
updating rspec tests for new fixtures
Sep 12, 2012
031c8cb
Merge branch 'master' into dan-all-solr-searches
Sep 12, 2012
7f46b03
Merge branch 'finder-tests' into dan-all-solr-searches
Sep 12, 2012
d5b64c8
Get support for asset states
bmatheny Sep 12, 2012
04463b2
fixing regex-related issues
Sep 12, 2012
730d80e
Support for state gets and updates
bmatheny Sep 13, 2012
b2eca8d
Cleaned up state update a bit
bmatheny Sep 13, 2012
1dd8b0b
Fixed comment
bmatheny Sep 13, 2012
7d8abfd
more find spec fixes
Sep 13, 2012
a570f35
Tying CollinScript into list generation code, adding some hacks
Sep 13, 2012
b30d3a4
Version bump to 0.2.4
bmatheny Sep 13, 2012
abcacab
Added state management support to ruby client
bmatheny Sep 13, 2012
3888996
Added support for setting asset state
bmatheny Sep 13, 2012
a0f40db
beginning work on rspec bootstrap and tools
Sep 13, 2012
17f6c4d
fixes to sql import
Sep 14, 2012
7de37ab
spec tests use db checksums to determine if reload necessary
Sep 14, 2012
b865fab
CollinsIntegration now provides client
Sep 14, 2012
fa80482
Refactoring Action system for greater justice, fixing CollinScript bugs
Sep 14, 2012
32d5185
fixing up spec tests
Sep 14, 2012
41a4cfe
Make callback handling non-blocking
bmatheny Sep 14, 2012
014cae3
new admin api endpoint for solr reindex, updated client, tests
Sep 14, 2012
4da82ad
Finishing Action refactor, tuning CollinScript tag decorators to make…
Sep 14, 2012
1372f61
Tuning build.sbt
Sep 14, 2012
7f84fe2
updating find tests for collins client property
Sep 14, 2012
bc74b12
Status.Enum form field to Status
bmatheny Sep 14, 2012
d73880a
Merge branch 'master' into steve-configurable-headers
Sep 14, 2012
c806d89
A few more cleanups
Sep 14, 2012
eab1482
Just a bit more cleanup
Sep 14, 2012
b410076
Just a _little_ more cleanup...
Sep 14, 2012
7fddd4f
Added dedicated endpoint for state management
bmatheny Sep 15, 2012
c6908a3
Adding code review suggestions
Sep 15, 2012
f6166d0
Simplified some unnecessarily complex logic
bmatheny Sep 15, 2012
6338c66
General status model related cleanup
bmatheny Sep 15, 2012
37bd341
collins-shell support for state management
bmatheny Sep 15, 2012
2ed7f95
Removed duplicate functionality
bmatheny Sep 15, 2012
b76941e
Version bump to 0.2.5
bmatheny Sep 15, 2012
f08d1f9
Version bump to 0.2.8
bmatheny Sep 15, 2012
ecaee72
Version bump to 0.2.9
bmatheny Sep 15, 2012
8f89464
Version bump to 0.2.13
bmatheny Sep 15, 2012
9a5a2f4
Gem upgrades for collins-client, state and shell
bmatheny Sep 15, 2012
8a26e5c
Merged master
bmatheny Sep 15, 2012
7d8165b
Merging from master
bmatheny Sep 16, 2012
70010d1
Merging master
bmatheny Sep 16, 2012
97d59c4
Fixing partial compilation/classpath linking bug
Sep 16, 2012
2fe07ec
Adding further code review improvements
Sep 16, 2012
0b67211
Merge branch 'steve-configurable-headers' of github.com:tumblr/collin…
Sep 16, 2012
29d1868
adding ping to client, moving checksums to separate file
Sep 16, 2012
bad8f76
fixing up finder tests
Sep 16, 2012
c4a9440
Route docs and grouping
bmatheny Sep 16, 2012
d8d2700
minor format fixes
Sep 17, 2012
b260d58
Merge branch 'dan-all-solr-searches' of github.com:tumblr/collins int…
Sep 17, 2012
f575ec5
Merge branch 'master' into finder-tests
Sep 17, 2012
494b811
updating asset state tests to use integration module
Sep 17, 2012
1fb4791
Merge branch 'master' into dan-all-solr-searches
Sep 17, 2012
fd9d042
Merge branch 'finder-tests' into dan-all-solr-searches
Sep 17, 2012
bec6210
fixing some merge conflicts, tests
Sep 17, 2012
e5771d2
fixing up tests
Sep 17, 2012
8cdc3bf
Tuning configuration system, making refresh thread-safer
Sep 17, 2012
86d1362
Removing detritus from main.scala.html
Sep 17, 2012
7866df5
Adding a writelock to the tryRefresh method, as SSE itself isn't thre…
Sep 17, 2012
7dc1d25
using SolrKeyResolver for static keys, fixing tests
Sep 17, 2012
9d6de0c
Adding asset row class action for search results
Sep 18, 2012
c148103
Updated gitignore to reflect new gh-pages docs
bmatheny Sep 18, 2012
9fd6ab5
conf fix
Sep 18, 2012
87a45d5
Tuning SearchResults row class stuff
Sep 18, 2012
021fc13
Tuning SearchResults row class stuff
Sep 18, 2012
0436fb6
Tuning SearchResults row class stuff
Sep 18, 2012
b208372
new util script, output cleanup
Sep 18, 2012
3093aab
conf fix
Sep 18, 2012
604ec80
GET /api/admin/solr returns 501 instead of 500 if solr not enabled
Sep 18, 2012
c707dd1
new StringValueFormat to handle regex/wildcard formatting
Sep 19, 2012
624aa78
Merge pull request #42 from tumblr/finder-tests
bmatheny Sep 19, 2012
3db2d22
Fixed conflict
bmatheny Sep 19, 2012
b420c58
Updating gitignore
bmatheny Sep 19, 2012
3bcf978
Making solr on by default, enabled always true
bmatheny Sep 19, 2012
14c742e
fixing more quoting and range value issues, moar tests
Sep 19, 2012
13b1810
Merge branch 'dan-all-solr-searches' of github.com:tumblr/collins int…
Sep 19, 2012
72a72fd
adding some more rpsec tests for regex
Sep 19, 2012
47b14f4
fixing some asset finder behavior, tests
Sep 19, 2012
6688704
Code now compiles with AssetType.Enum removed
bmatheny Sep 19, 2012
853f656
Tests now compile
bmatheny Sep 19, 2012
4ebc151
Added label column to AssetType to make it behave
bmatheny Sep 19, 2012
c02581b
Use labels for asset types when we have them
bmatheny Sep 19, 2012
876ba13
Merge pull request #1 from tumblr/dan-all-solr-searches
bmatheny Sep 19, 2012
ac04558
Removing stray println
bmatheny Sep 19, 2012
264c1e6
Adding suggestions from Typesafe's James Roper which fix CollinScript…
Sep 20, 2012
a0b4b0e
Adding iterative polymorphic method match check as suggested by Typesafe
Sep 20, 2012
60ebd8b
Adding new collins instance for EWR01
bmatheny Sep 21, 2012
63b50cb
accounting for .* leading and trailing regex to wildcard conversion
Sep 21, 2012
cae3043
Merge branch 'master' of github.com:tumblr/collins
Sep 21, 2012
53287a3
Fixing merge conflict
bmatheny Sep 21, 2012
6a54e59
fixing string fields to be case insensitive
Sep 21, 2012
a38dafc
Removing some withName enumeration lookups
bmatheny Sep 21, 2012
ec9ab53
Merge branch 'master' of github.com:tumblr/collins
Sep 21, 2012
9ecc679
Version bump to 0.2.6
bmatheny Sep 21, 2012
0c73376
Updating new gem
bmatheny Sep 21, 2012
7a5f41e
Graph plugin support refs #41
bmatheny Sep 22, 2012
44d59bd
Only show tab-pane if graph plugin is enabled
bmatheny Sep 22, 2012
a51a994
Broke out FibrGraphConfig into own file
bmatheny Sep 22, 2012
a809344
Allow online graph config changes refs #41
bmatheny Sep 22, 2012
9001f1f
Merge branch 'master' into graph_plugin
bmatheny Sep 22, 2012
86e3900
Log out of range exception
bmatheny Sep 22, 2012
a8a617b
Encrypted tags now get quiet logging, closes #37
bmatheny Sep 22, 2012
fcfe773
Include previous/new status/state in log when values are changed
bmatheny Sep 23, 2012
ca02d34
Ditching old collins servers
bmatheny Sep 23, 2012
ceaa0a4
CollinScript cleanup
Sep 24, 2012
55e7c0c
Merge branch 'master' into steve-configurable-headers
Sep 24, 2012
e4993d4
Refactoring, cleanup, and slightly increased concision
Sep 25, 2012
eaf10f5
Merging in tag sort stuff
Sep 25, 2012
d5062e0
Making header sorting work again
Sep 25, 2012
8f80413
A little cleanup around refresh locking
Sep 25, 2012
89c4f52
Fixing code review suggestions
Sep 25, 2012
9a86a8f
Adding some comments to searchresults_reference.conf
Sep 25, 2012
67787e2
Gak, tagdecorators_reference didn't come up in the first push
Sep 25, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
19 changes: 18 additions & 1 deletion .gitignore
View file
Open in desktop
@@ -1 +1,18 @@
*.go_
./logs
project/project
project/target
target
tmp
dist
*.swp
tags
*.log
profileOfH2Tests.html
test.rb
*.db
_site
RUNNING_PID
conf/solr/data/
.DS_Store
Gemfile.lock

174 changes: 0 additions & 174 deletions 3rdparty/thrift/tapplication_exception.go
View file
Open in desktop

This file was deleted.

42 changes: 0 additions & 42 deletions 3rdparty/thrift/tapplication_exception_test.go
View file
Open in desktop

This file was deleted.

66 changes: 0 additions & 66 deletions 3rdparty/thrift/tbase.go
View file
Open in desktop

This file was deleted.