SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
Ben CarmenBen Carmen
611c220d214Merge pull request #170 in SHRINE/shrine from bugfix/SHRINE-2632-remove-annoying-line to release/1.25.3 * commit 'ea...
bendcarmenbendcarmen
4dca3d5bf62Potential fix of SHRINE-2630
bendcarmenbendcarmen
ea08e1314b1Potential fix of SHRINE-2632
Marc-Danie NazaireMarc-Danie Nazaire
f6b280f6ba7Merge pull request #168 in SHRINE/shrine from bugfix/SHRINE-2591-update-values-for-context.xml to release/1.25.3 * c...
marc-daniemarc-danie
1571dbd671bSHRINE-2625 - Database tuning on QEP machines
marc-daniemarc-danie
77001ebc4faMerge branch 'release/1.25.3' of https://open.med.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE-2510-webclie...
marc-daniemarc-danie
f789930ee1eSHRINE-2510- Webclient: An unanticipated problem encountered while running a query which takes a while to run
David WalendDavid Walend
3834507f145Updated pom.xml files to build SHRINE 1.25.3.3-SNAPSHOT
David WalendDavid Walend
b73af6a3985Missed a hornetq reference in the sample shrine.conf
David WalendDavid Walend
0d9ca75cc07Merge pull request #166 in SHRINE/shrine from bugfix/SHRINE-2624-keep-the-receiver-thread-alive to release/1.25.3 * ...
marc-daniemarc-danie
39695127fd5Merge branch 'release/1.25.3' of https://open.med.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE-2591-update-...
marc-daniemarc-danie
63fd0e6e165SHRINE-2591 - Update values for context.xml - added an example context.xml with the updated values for maxTotal, maxI...
bendcarmenbendcarmen
6c9980bedb8Build of js ready for QA
Marc-Danie NazaireMarc-Danie Nazaire
c0179c48e5aMerge pull request #167 in SHRINE/shrine from bugfix/SHRINE-2626-remove-reference-to-local-file to release/1.25.3 * ...
David WalendDavid Walend
9410832bed5Marc-Danie found a typo
marc-daniemarc-danie
eeb46ccd66cSHRINE-2626 - Remove reference to local file path in JMeter automation script
David WalendDavid Walend
fcff187a38dIgnoring all but the worst exceptions while completing for SHRINE-2622
Ben CarmenBen Carmen
ceeefca632aMerge pull request #165 in SHRINE/shrine from bugfix/SHRINE-2606-missing-breakdowns to release/1.25.3 * commit '5454...
Ben CarmenBen Carmen
b2029946e01Merge pull request #164 in SHRINE/shrine from feature/SHRINE-2620-error-tooltip to release/1.25.3 * commit 'a1e95586...
bendcarmenbendcarmen
a1e95586db2Added a max length for tooltip of 40 characters
bendcarmenbendcarmen
31557999c82Saving changes
bendcarmenbendcarmen
2f606e1a24cRefactor of Sagas
bendcarmenbendcarmen
54546b73825Potential fix of SHRINE-2606
Ben CarmenBen Carmen
faa0398f237Merge pull request #161 in SHRINE/shrine from feature/SHRINE-2618-remove-junky-text to release/1.25.3 * commit 'f1c0...
bendcarmenbendcarmen
f1c040a4aefFix of merge conflict
Ben CarmenBen Carmen
ca075b43d00Merge pull request #162 in SHRINE/shrine from feature/SHRINE-2615-consistent-breakdowns-text to release/1.25.3 * com...
Ben CarmenBen Carmen
d58f838bd28Merge pull request #163 in SHRINE/shrine from bugfix/SHRINE-2617-default-query-status-text to release/1.25.3 * commi...
bendcarmenbendcarmen
d621e46f50bPotential solution for SHRINE-2620
bendcarmenbendcarmen
e068ba54b69Potential fix of SHRINE-2617
bendcarmenbendcarmen
52fc0e63db4Changed wording of tabs to Breakdowns
bendcarmenbendcarmen
4a85066a81bWorking on Saga organization
bendcarmenbendcarmen
51c801d8c30Potential Fix of SHRINE-2618
bendcarmenbendcarmen
e76240e77f4Refactor of Redux Saga for threadding
Marc-Danie NazaireMarc-Danie Nazaire
3a759ab469fMerge pull request #160 in SHRINE/shrine from bugfix/SHRINE-2595-modify-the-jmeter-network-check to release/1.25.3 *...
David WalendDavid Walend
37f4ec5647bMerge pull request #159 in SHRINE/shrine from bugfix/SHRINE-2611-trim-shrine-meta.log-file to release/1.25.3 * commi...
David WalendDavid Walend
c8f4c67207eMerge pull request #158 in SHRINE/shrine from bugfix/SHRINE-2604-out-of-memory-due-to-short-threads to release/1.25.3...
marc-daniemarc-danie
32842b8e543SHRINE-2600 - Modify JMeter network check automation code to not include the timestamp in the name of the jtl output ...
marc-daniemarc-danie
7b7b3e46eabSHRINE-2595 - Modify the JMeter network check automation bamboo to fail if a query does not make it pass QEP
Marc-Danie NazaireMarc-Danie Nazaire
b41f216b901Merge pull request #157 in SHRINE/shrine from bugfix/SHRINE-2480-catch-and-log-exceptions-at-startup to release/1.25....
marc-daniemarc-danie
6fd2b542ca8SHRINE-2480 - Catch and log exceptions at startup in shrine.log - added () to the initResources method
marc-daniemarc-danie
86cf906ef60SHRINE-2480 - Catch and log exceptions at startup in shrine.log - removed unused import
marc-daniemarc-danie
9e51d63e181SHRINE-2480 - Catch and log exceptions at startup in shrine.log - replaced extending Loggable with calling Log
David WalendDavid Walend
234f7ac5bc1Less logging for SHRINE-2611
marc-daniemarc-danie
436cbd1e339SHRINE-2480 - Catch and log exceptions at startup in shrine.log - changes from peer review
David WalendDavid Walend
128986d461eException handler of last resort for the message sending thread.
marc-daniemarc-danie
e86769c07d2Merge branch 'release/1.25.3' of https://open.med.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE-2480-catch-a...
marc-daniemarc-danie
f928541f3c6SHRINE-2480 - Catch and log exceptions at startup in shrine.log - changed log output
marc-daniemarc-danie
181853a3b3dSHRINE-2480 - Catch and log exceptions at startup in shrine.log - Modified initialization of ShrineOrchestrator so th...
David WalendDavid Walend
87bd6ff6210Merge pull request #156 in SHRINE/shrine from bugfix/SHRINE-2604-out-of-memory-due-to-short-threads to release/1.25.3...
David WalendDavid Walend
06e8335fd94SHRINE-2604 again, now with a queue to be a bit gentler with system resources.
David WalendDavid Walend
d0e62a8b29eRemoved the synchronized{} block for SHRINE-2604
David WalendDavid Walend
797e06b6ac8Merge pull request #155 in SHRINE/shrine from bugfix/SHRINE-2604-out-of-memory-due-to-short-threads to release/1.25.3...
David WalendDavid Walend
da10256097aAdded a synchronized block for SHRINE-2604 to lessen the denial-of-service attack from the mock CRC.
David WalendDavid Walend
c9b4435851dFirst batch of changes to oracle ddl for SHRINE-1970
marc-daniemarc-danie
aec48df1b70SHRINE-2480 - Catch and log exceptions at startup in shrine.log - removed all except for one lazy variable
marc-daniemarc-danie
f69848cf786SHRINE-2480 - Catch and log exceptions at startup in shrine.log - removed more lazy variables
marc-daniemarc-danie
af27a669db2SHRINE-2480 - Catch and log exceptions at startup in shrine.log - removed even more lazy variables
marc-daniemarc-danie
26bdc44bb06SHRINE-2480 - Catch and log exceptions at startup in shrine.log - removed more lazy variables
Ben CarmenBen Carmen
07f46466f16Merge pull request #153 in SHRINE/shrine from bugfix/SHRINE-2601-default-breakdown-message to release/1.25.3 * commi...
Ben CarmenBen Carmen
dbad4b07347Merge pull request #154 in SHRINE/shrine from bugfix/SHRINE-2594-stacktrace-mashup to release/1.25.3 * commit '2d82f...
bendcarmenbendcarmen
2d82f82a921Made mock problemDigest more readable
bendcarmenbendcarmen
0fead5c078fAdded closing details
bendcarmenbendcarmen
aa5097668d2MUCH better way to do this!
bendcarmenbendcarmen
6770c6a4634Hopefully...more readable than previous version
bendcarmenbendcarmen
9005f552602Potential fix of SHRINE-2594
David WalendDavid Walend
61fcbed574eMerge pull request #152 in SHRINE/shrine from feature/SHRINE-2598-try-some-indexing-in-the-database to release/1.25.3...
bendcarmenbendcarmen
07a4c145a69Potential fix for SHRINE-2601
marc-daniemarc-danie
f7136494f04SHRINE-2595 - Modify the JMeter network check automation bamboo to fail if a query does not make it pass QEP - remove...
David WalendDavid Walend
5364d2acf79Indexing for oracle and mssql for SHRINE-2598
Ben CarmenBen Carmen
fa38b426332Merge pull request #151 in SHRINE/shrine from bugfix/SHRINE-2601-status-text-alignment to release/1.25.3 * commit '4...
bendcarmenbendcarmen
4c8ebaa0a27Potential fix of SHRINE-2601
Ben CarmenBen Carmen
44fa2a23911Merge pull request #150 in SHRINE/shrine from bugfix/SHRINE-2596-font-style to release/1.25.3 * commit 'b968a7bf2ee0...
bendcarmenbendcarmen
b968a7bf2eeFixed css issue with SASS mixin
David WalendDavid Walend
46e14bc2424Merge pull request #149 in SHRINE/shrine from bugfix/SHRINE-2597-catch-and-handle-illegalargumentexception to release...
bendcarmenbendcarmen
b1df3c63ebdPotential fix of SHRINE-2596
David WalendDavid Walend
8a17ca57fe5Mysql database changes for SHRINE-2598
bendcarmenbendcarmen
0daa4638d45Categorizing actions as server and shrine
David WalendDavid Walend
ef301e256e7Very precise catch for SHRINE-2597 - netty sad behavior when resources are tight.
Marc-Danie NazaireMarc-Danie Nazaire
297dde0b991Merge pull request #145 in SHRINE/shrine from bugfix/SHRINE-2586-investigate-500-errors-coming to release/1.25.3 * c...
marc-daniemarc-danie
46de57b1745Merge branches 'bugfix/SHRINE-2586-investigate-500-errors-coming' and 'release/1.25.3' of https://open.med.harvard.ed...
David WalendDavid Walend
ce79a554bb3Merge pull request #148 in SHRINE/shrine from feature/SHRINE-2593-add-property-for-the-akka-authorization to release/...
David WalendDavid Walend
90e204c82ceFix for SHRINE-2592 - default timeout for queries in the CRC to 30 seconds.
David WalendDavid Walend
c2c8c691102Added configurable timeout for the authorization akka actors for SHRINE-2593
Ben CarmenBen Carmen
4a240a85330Merge pull request #147 in SHRINE/shrine from bugfix/SHRINE-2580-fix-date-filter to develop * commit '58f271249ef3b6...
bendcarmenbendcarmen
58f271249efPotential fix of date filter
David WalendDavid Walend
a559ab3f4b4Merge pull request #146 in SHRINE/shrine from bugfix/SHRINE-2589-test-of-a-two-node-network-bounded to release/1.25.3...
David WalendDavid Walend
0a6c114e1d5Marc-Danie caught this.
marc-daniemarc-danie
699baf583d7SHRINE-2586 - Investigate 500 errors coming from the mock CRC - removed the wilcard import of org.http4s.servlet
marc-daniemarc-danie
a9c435cbc59SHRINE-2586 - Investigate 500 errors coming from the mock CRC - simplified the new mountService function and also add...
marc-daniemarc-danie
7f69ce79308SHRINE-2586 - Investigate 500 errors coming from the mock CRC - changed the POM version back to 1.25.3.1-SNAPSHOT
David WalendDavid Walend
a98e4c873bbAdded a config value (and defaults of 30 seconds instead of the hard-coded 10 seconds) for time to call into the slic...
marc-daniemarc-danie
c78d485c5dcSHRINE-2586 - Investigate 500 errors coming from the mock CRC -removed unused import
marc-daniemarc-danie
051f35bf1acMerge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE-2586-investigate-50...
marc-daniemarc-danie
a38ec76213aSHRINE-2586 - Investigate 500 errors coming from the mock CRC
bendcarmenbendcarmen
a32606789b1Merge branch 'develop' into feature/js-infrastructure
bendcarmenbendcarmen
5fd54508ac6Added Query Export to Sagas
Marc-Danie NazaireMarc-Danie Nazaire
eda80ac29a3Merge pull request #144 in SHRINE/shrine from bugfix/SHRINE-2582-expose-the-username-password to develop * commit 'b...
David WalendDavid Walend
4781c534882Moved the release branch to 1.25.3.2-SNAPSHOT
bendcarmenbendcarmen
fbbc51aad92Merge branch 'develop' into feature/js-infrastructure
bendcarmenbendcarmen
e4d0620b93dUpdated POMs to 1.26.1.1
bendcarmenbendcarmen
5a19813534fSaving work on Query Export
bendcarmenbendcarmen
2cf26f14596update of Saga
marc-daniemarc-danie
ba295f9d9ebSHRINE-2582 - Expose the username, password, and domain in the JMeter automation script - also removed some unnecessa...
bendcarmenbendcarmen
2c70b467886Fix of === to !== so that results will show up in the Query Viewer
bendcarmenbendcarmen
401ee67089elatest
David WalendDavid Walend
0c67e0da3eeMerge pull request #143 in SHRINE/shrine from feature/SHRINE-2584-update-to-the-latest-http4s-and to develop * commi...
David WalendDavid Walend
fd3942efdafMerge pull request #142 in SHRINE/shrine from bugfix/SHRINE-2583-netty-exception-on-shrine-scaleup01 to develop * co...
bendcarmenbendcarmen
b95aa653767Merge branch 'develop' into feature/js-infrastructure
David WalendDavid Walend
ebef474bc84Upgraded to the latest http4s for SHRINE-2584
David WalendDavid Walend
75129dd74e8Added a new (netty) exception to the set of exceptions to retry for SHRINE-2583
bendcarmenbendcarmen
53ff7ae1bb6Updated Graphing messages for pending, no graphs and idle per meeting last Friday
bendcarmenbendcarmen
26cbe63d138Rebuild of js to see if it fixes build error
Ben CarmenBen Carmen
e319f4b5c2dMerge pull request #140 in SHRINE/shrine from bugfix/SHRINE-2566-retry-on-timeout to develop * commit 'd99c31f0d5a8d...
David WalendDavid Walend
18a038bdb82Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
David WalendDavid Walend
96a691c1defAdded a blocking block to maybe fix SHRINE-2578
David WalendDavid Walend
c1667678322Notes on setting up proxies
David WalendDavid Walend
ab707ee7ed9Merge pull request #141 in SHRINE/shrine from bugfix/SHRINE-2561-stack-traces-are-mashed-up to develop * commit 'c03...
David WalendDavid Walend
c032d6b6fd1Uses a toString for the XML element to preserve tags. .text apparently does not do that. For SHRINE-2561
David WalendDavid Walend
e253e0a7998Test for mashed up stack traces - SHRINE-2561
bendcarmenbendcarmen
d99c31f0d5aAdded a 15 second delay before polling the server again
bendcarmenbendcarmen
32fbc4909cdMerge branch 'develop' into bugfix/SHRINE-2566-retry-on-timeout
bendcarmenbendcarmen
804f1b6a87cSaving work on Sagas
bendcarmenbendcarmen
aceaf463a53Added some readme notes about the architecture
bendcarmenbendcarmen
05e5ed46e83Addition of redux-saga for side effects
bendcarmenbendcarmen
63e597cdc3cSimplified bootup logic
bendcarmenbendcarmen
7c07d415a82Incorporated suggested changes from review
bendcarmenbendcarmen
c2d218a4d39Saving promise work at startup
bendcarmenbendcarmen
855ca2bf8d5Function tabs and viewport
bendcarmenbendcarmen
9951c8bcb5dClean up of build artifacts
bendcarmenbendcarmen
7d7a510491dsome cleanup
bendcarmenbendcarmen
f7eab967d2cPotential fix for SHRINE-2567
bendcarmenbendcarmen
098ed7dd7f0Potential working solution
bendcarmenbendcarmen
47be291ff41Simplification of promise logic
Marc-Danie NazaireMarc-Danie Nazaire
b0d97d386e6Merge pull request #134 in SHRINE/shrine from bugfix/SHRINE-2569-add-delay-to-the-mock-crc to develop * commit '40c3...
marc-daniemarc-danie
40c37460126SHRINE-2569- Add delay to the Mock CRC - added unit tests and also updated http4s dependencies to 0.18.8, some addito...
marc-daniemarc-danie
8504f31d592SHRINE-2569- Add delay to the Mock CRC - added unit tests and also updated http4s dependencies to 0.18.8
Ben CarmenBen Carmen
cb320009065Merge pull request #137 in SHRINE/shrine from bugfix/SHRINE-2523-unspecified-error-has-occured to develop * commit '...
David WalendDavid Walend
74cbe6ad1bcMerge pull request #139 in SHRINE/shrine from bugfix/SHRINE-2566-enable-the-web-client-to-retry to develop * commit ...
marc-daniemarc-danie
c0c6408f3c0SHRINE-2569- Add delay to the Mock CRC - added dependencies needed for testing
Marc-Danie NazaireMarc-Danie Nazaire
cfff4c5c1b3Merge pull request #138 in SHRINE/shrine from feature/SHRINE-2572-code-for-checking-network-health to develop * comm...
bendcarmenbendcarmen
231b821223fSuggested wording from review
marc-daniemarc-danie
30fc8e01984SHRINE-2572- Code for checking network health using JMeter Maven plugin - adding the Burns query
marc-daniemarc-danie
2260a8d7081SHRINE-2572- Code for checking network health using JMeter Maven plugin - updated teh properties file and fixed pom v...
marc-daniemarc-danie
671b5f4aa5dSHRINE-2572- Code for checking network health using JMeter Maven plugin - added comment about the SSL redirect host
David WalendDavid Walend
5df8b45360dA little test code to support SHRINE-2566
Marc-Danie NazaireMarc-Danie Nazaire
d484fed462fMerge pull request #136 in SHRINE/shrine from bugfix/SHRINE-2573-modify-mock-crc-to-work-with to develop * commit 'c...
marc-daniemarc-danie
efbf7bb1c87SHRINE-2572- Code for checking network health using JMeter Maven plugin
marc-daniemarc-danie
c8dba40de06SHRINE-2573 - Modify Mock CRC To work with or without trailing slash
bendcarmenbendcarmen
12760d96344A default error message if statusMessage is undefined.
Ben CarmenBen Carmen
1f2feeecbcfMerge pull request #135 in SHRINE/shrine from SHRINE-SHRINE-2551-make-queued-green to develop I moved the queued-sta...
bendcarmenbendcarmen
41de01f9731Moved shared, queued status to query-status.scss
bendcarmenbendcarmen
598e7630062Potential fix of GREEN queued status
bendcarmenbendcarmen
24d26dff400Saving Tab and Container progress
marc-daniemarc-danie
99c73ea887eSHRINE-2569- Add delay to the Mock CRC - modified to use fold()() instead of match
David WalendDavid Walend
52fc8221b33Merge pull request #132 in SHRINE/shrine from bugfix/SHRINE-2562-catch-this-timeout-and-maybe to develop * commit 'b...
marc-daniemarc-danie
715a3776c80SHRINE-2569- Add delay to the Mock CRC - variable renaming and removed triple quotes
David WalendDavid Walend
0ebeed2c957Merge pull request #133 in SHRINE/shrine from bugfix/SHRINE-2566-enable-the-web-client-to-retry to develop * commit ...
bendcarmenbendcarmen
776f7458954merge of developer
marc-daniemarc-danie
f3a13b69907SHRINE-2569- Add delay to the Mock CRC
bendcarmenbendcarmen
4f83c704a8bIncorporated feedback from meeting
David WalendDavid Walend
b9c5d600f2fSome logging for SHRINE-2562
David WalendDavid Walend
065e8f47741Added a special timeout handler for SHRINE-2566
David WalendDavid Walend
76293f95a33Trapping a timeout exception that bubbles all the way to catalina.out for SHRINE-2562
Marc-Danie NazaireMarc-Danie Nazaire
140cbdd1136Merge pull request #131 in SHRINE/shrine from bugfix/SHRINE-2554-upgrade-to-scala-2.11.12 to develop * commit '34d66...
marc-daniemarc-danie
34d660d848aSHRINE-2554 - Upgrade to Scala 2.11.12
David WalendDavid Walend
9c6eba329e7Merge pull request #130 in SHRINE/shrine from feature/SHRINE-2552-create-a-http-client-server-bridge to develop * co...
David WalendDavid Walend
bf1f57cd65bMarc-Danie found a cut-paste problem during review of SRHINE-2552
David WalendDavid Walend
d737ed25633Create just one httpClient for SHRINE-2552
David WalendDavid Walend
8e19d35a232Merge branch 'develop' into feature/SHRINE-2552-create-a-http-client-server-bridge
David WalendDavid Walend
1174602596cJose's suggestion for getting the whole body for SHRINE-2552
David WalendDavid Walend
c8ee473da0cBetter command line parameters and response for SHRINE-2552
David WalendDavid Walend
c4f6db74bbdSome code cleanup for SHRINE-2552
David WalendDavid Walend
96d30a5fbb7Testing vs. real systems for SHRINE-2552
David WalendDavid Walend
49f65567b21Merge pull request #129 in SHRINE/shrine from feature/SHRINE-2452-upgrade-to-akka-2.5.8-if-possible to develop * com...
bendcarmenbendcarmen
911585e79fdIncorporated suggestions from team
Ben CarmenBen Carmen
eb1eeddd709Merge pull request #128 in SHRINE/shrine from feature/tabs-enhancements to develop * commit '4a2579dfb1e7982d32f2ae8...
David WalendDavid Walend
61fdd872edcBuilding up what looks like the right request for SHRINE-2552
David WalendDavid Walend
63dd82a1c85Now seeing a request for SHRINE-2552
David WalendDavid Walend
96bce203d94Hello world works
David WalendDavid Walend
3383ad4a22eCompiles
David WalendDavid Walend
731a54838a5Copied http4s-client-test as the starting point for SHRINE-2552
David WalendDavid Walend
822f699d88fWrong directory to copy
David WalendDavid Walend
2f9447a4889Copied http4s-client-test as the starting point for SHRINE-2552
David WalendDavid Walend
70462a35bc1Merge branch 'develop' into feature/SHRINE-2452-upgrade-to-akka-2.5.8-if-possible
David WalendDavid Walend
65af439199fComment cleanup for SHRINE-2532
David WalendDavid Walend
f9ec3634a58Some cleanup with the new web client for SHRINE-2532
Marc-Danie NazaireMarc-Danie Nazaire
78b41c70fe1Merge pull request #127 in SHRINE/shrine from SHRINE-2534-scaleup-testing-create-mock-crc to develop * commit '4c63d...
David WalendDavid Walend
ebc4d4074daNow using the timeout for SHRINE-2532