Commit Graph

595 Commits

Author SHA1 Message Date
Brian Palmer 1bc5174211 remove Worker#ensure_db_connection
test plan: run a delayed jobs pool, and verify that jobs still complete successfully

Change-Id: I9fbadee51b05f667dafcb9173af2e75bf905c1e0
Reviewed-on: https://gerrit.instructure.com/40453
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
2014-09-03 20:23:33 +00:00
Brian Palmer 29b12ad2fa add job source to the "Processing" log line json
test plan: run jobs, the "Processing" log line when the job starts
should include the source field among the other json fields. This source
field has the marginalia information about the web request or other job
that created this job.

Change-Id: If58da146b241b12093fd31822b93924481434143
Reviewed-on: https://gerrit.instructure.com/40352
Reviewed-by: Hubert depesz Lubaczewski <hlubaczewski@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Nick Cloward <ncloward@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
2014-09-02 15:49:31 +00:00
Cody Cutrer dc535d3249 include job shard in process name for worker
test plan:
 * run delayed jobs
 * using `ps aux | grep delay` confirm that the worker's
   shard id is included in the wait (likely 1)
 * in console, do `Kernel.send_later(:sleep, 60)`
 * using `ps aux | grep delay` confirm that the job's
   shard id is included (likely 1)

Change-Id: I4ef23c5fba72ae72441ba40e5890d5678a8223c3
Reviewed-on: https://gerrit.instructure.com/40210
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
2014-08-29 18:11:09 +00:00
Brian Palmer d6c9d87f76 add the canvas version to delayed_jobs_pool proc name
test plan: with a VERSION file in your rails root, run delayed jobs, the
process name will include the contents of the VERSION file. with no
VERSION file, it won't.

Change-Id: I773ff4ace5facdb48d415ad7528daaf761aeab1d
Reviewed-on: https://gerrit.instructure.com/40162
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
2014-08-28 18:25:49 +00:00
Brian Palmer 3832e6507f log tag in jobs "Processing" log line
test plan: run delayed jobs, the "Processing" log line at the beginning
of every job should include the job's tag in the json.

Change-Id: I0854fcdb5adf9197b66efd13bfc2a9b0e9541260
Reviewed-on: https://gerrit.instructure.com/40096
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
2014-08-27 21:50:29 +00:00
Brian Palmer b55992e8ac gemify respondus_soap_endpoint
This turns the vendor/plugin into a rails engine, and establishes the
convention of canvas-dependent rails engines/gems going into
gems/plugins, and everything in that dir being auto-required and added
to canvas spec runs.

closes CNVS-14286

test plan: regression test on the respondus quiz builder client. no
behavior should change.

Change-Id: I51b548418bcb70af77e87c2c2d62cac27ed4ab44
Reviewed-on: https://gerrit.instructure.com/38394
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
2014-08-21 16:49:54 +00:00
James Williams e33e0c5d0f fix moodle 1.9 file importing
test plan:
* import a moodle 1.9 package with files in the
"course files" directory
* all the files should all be imported

closes #CNVS-14872

Change-Id: I90df086eac2873e05d1a9a26fb30f71464dd9814
Reviewed-on: https://gerrit.instructure.com/39511
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
2014-08-19 15:35:37 +00:00
James Williams a0d1b2d4cc improve blackboard true/false question parsing
test plan:
* import the first package referenced in the ticket
 (with "BBtestmgr" in the title)
* should bring in the true/false questions without errors

closes #CNVS-14569

Change-Id: Ibe56af41852234c7e982fcb37166ad5c55e61fda
Reviewed-on: https://gerrit.instructure.com/38801
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
2014-08-09 20:15:57 +00:00
Cody Cutrer 1f3e2e145f disconnect dj, but don't reconnect on fork
fixes CNVS-14645

it may not be needed (if the worker is processing for a different
shard)

Change-Id: Ie0422bf457408d2a60eb166b8a564b3c180ec983
2014-08-07 20:39:47 -06:00
James Williams 2f4496c0a8 improve qti 2 detection
test plan:
* import the second package referenced in the ticket
(with "QTImgr" in the title)
* should import the questions correctly

refs #CNVS-14569

Change-Id: I5ab413fc6a843b47bc641713915117e757192858
Reviewed-on: https://gerrit.instructure.com/38800
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
2014-08-06 18:50:43 +00:00
James Williams 81558f728c remove rails 2 support
closes #CNVS-14261

Change-Id: I1b0e8a4438ab659ecd1ac8462bc3559d810989b3
Reviewed-on: https://gerrit.instructure.com/38744
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2014-08-06 18:16:19 +00:00
James Williams 3d1bade940 try to escape unmatched brackets in qti question text
test plan:
* import the package referenced in the ticket
* the quiz question titled "soccs7g 9.1-9" should
have a "<" character properly shown in the question text

closes #CNVS-9919

Change-Id: I42af7634f0925d5ffc3acf78c4e139df36ed9e4d
Reviewed-on: https://gerrit.instructure.com/38698
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Trevor deHaan <tdehaan@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2014-08-05 17:14:18 +00:00
James Williams 829478bc38 add support for tar and tar.gz archives in content migrations
also add limits for byte size and file count to prevent
zip/tar "bombs"

test plan:
 * import the package referenced in the ticket
 * should import successfully

 * content migration regressions

closes #CNVS-14303 #CNVS-14428

Change-Id: Ia424b5260e34f35b62ca47f7aafa77118c4f5b5b
Reviewed-on: https://gerrit.instructure.com/37881
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Trevor deHaan <tdehaan@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2014-08-01 12:36:27 +00:00
Cody Cutrer 96ce62b022 reload between jobs
Change-Id: I4dc616f6695671830a5e1b36ea73db1da1977f19
Reviewed-on: https://gerrit.instructure.com/37413
Reviewed-by: Cameron Sutter <csutter@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-07-23 20:06:55 +00:00
Jeremy Stanley 1c30417b20 spec: fix fragile file specs
the filename may not match the display_name if the newly uploaded
attachment is not a root attachment

refs CNVS-14376

Change-Id: I9e108e9311157fd6b91230090f1b114109b67a7f
Reviewed-on: https://gerrit.instructure.com/38017
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: James Williams  <jamesw@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Jeremy Stanley <jeremy@instructure.com>
2014-07-23 13:04:32 +00:00
James Williams b6d8cc4957 spec: add moodle 2 converter specs
Change-Id: I4033273789a7ef65ce2d86cbec7c9e47eff8a0ba
Reviewed-on: https://gerrit.instructure.com/37902
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2014-07-21 14:50:22 +00:00
James Williams 5d2c8941be reorder matching questions with images if possible
test plan:
* import the package referenced in the ticket
* matching questions that would have before tried to put the
 images on the right hand side should now have the two sides
 reversed

closes #CNVS-13362

Change-Id: Iae3483da9d2f976204d15806b5b9d69bf56a481e
Reviewed-on: https://gerrit.instructure.com/37666
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: Hilary Scharton <hilary@instructure.com>
2014-07-17 15:41:45 +00:00
James Williams b70425e87c bump moodle2cc version to 0.2.12
refs #CNVS-11945 #CNVS-13362

Change-Id: Ibb6fc7d27cb866caec8ade19c5dc9016273b6d5d
Reviewed-on: https://gerrit.instructure.com/37630
Reviewed-by: Nathan Mills <nathanm@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2014-07-15 15:56:50 +00:00
James Williams e0703924bf don't convert relative answer tolerances to floats
test plan:
* create a formula question
* use relative margin of error (e.g. '1%')
* copy the course
* should not have turned the '1%' into a '1'

fixes #CNVS-10580

Change-Id: Ie31b7dafc083b1be704ea21534ce8a2cb0eff3b2
Reviewed-on: https://gerrit.instructure.com/37521
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
2014-07-14 14:28:24 +00:00
Jacob Fugal d9c6e2a0cd clarify Slug vs. UUID and fix event stream
refs CNVS-13987

what was called CanvasUuid was *not* generating UUIDs. it was generating
slugs. by default, its generate method only creates 4 character slugs.
these should obviously not be used as UUIDs. the misnomer already caused
a bug in EventStream where it used these slugs as UUIDs, causing
collisions. to fix:

 (1) rename canvas_uuid gem to canvas_slug, and rename it's primary
     class CanvasUuid to CanvasSlug
 (2) create new canvas_uuid gem, with class CanvasUUID, extracted from
     lib/uuid_singleton for actual UUID generation
 (3) fix event stream use CanvasUUID, rather than following the rename
     of CanvasUuid to CanvasSlug

test-plan:
 - have cassandra set up for audit logs
 - create an audit log entry (e.g. change a grade)
 - look at the generated audit log entry's id field; it should be a UUID
   value, not a 4 character slug

Change-Id: I19758fff4433cd6cb2e21219217dced19ee05c5a
Reviewed-on: https://gerrit.instructure.com/37506
Reviewed-by: Rob Orton <rob@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: August Thornton <august@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
2014-07-11 16:58:42 +00:00
Cody Cutrer ed29d9a9cd use a temp table for find_in_batches when select does not include id
also add hash of query to temp table name. this fixes nested
queries, but also defeats query cache getting confused

fixes CNVS-13783

test plan:
 * *don't* have a slave configured in database.yml
 * run the last_user_access report
 * it should work

Change-Id: I6fba9826f6cfee5a2e651157fd898f42c0e1345e
Reviewed-on: https://gerrit.instructure.com/36911
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Rob Orton <rob@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-07-10 18:18:38 +00:00
dave 10268ebff0 add limiting period to grade export report
***test plan
  1. through the api pass parameters['include_deleted'] = true
    and parameters['limiting_period'] = some number of days
  2.  Make sure enrollments that have been deleted or concluded within
  specified # of days from above are returned in report
  3.  Make sure enrollments that are not concluded / deleted within
  specified number of days are not returned in the report

refs: PS-1698

Change-Id: Id24c58954dba2aed0a92cd5dea1946ef0764dc1a
Reviewed-on: https://gerrit.instructure.com/36612
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Brandon Broschinsky <brandonbr@instructure.com>
Product-Review: Adam Phillipps <adam@instructure.com>
QA-Review: Adam Phillipps <adam@instructure.com>
2014-07-07 20:37:51 +00:00
James Williams e0d647c507 improve qti associate interaction parsing
test plan:
* import the package referenced in the ticket
* the matching questions should list matches properly

fixes #CNVS-1617

Change-Id: I40a91e1916392cdc92c4a4f01ff3a1b99c35c735
Reviewed-on: https://gerrit.instructure.com/36524
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2014-07-02 19:29:16 +00:00
Rob Orton 60efb7930b consolidate i18n strings in account reports
refs CNVS-13751

test plan
 - rake i18n:generate should not fail

Change-Id: I27ee88ba85b84a1e5d13c3993fcad8e1b5006ff4
Reviewed-on: https://gerrit.instructure.com/36834
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
QA-Review: Rob Orton <rob@instructure.com>
2014-06-26 05:35:09 +00:00
Cody Cutrer da825c974e fix sanitization spec failure in ruby 2.1
ruby 2.1 escapes ', 1.9.3 does not. just avoid it in our
spec that isn't even testing sanitization

Change-Id: Ibd050c53ada97f1dce7c5f36cf8b9471811e59ae
Reviewed-on: https://gerrit.instructure.com/36820
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-06-25 16:33:11 +00:00
Cody Cutrer 36de3c91e4 remove deprecation warning in ruby 2.1
Change-Id: I458ba8a1dc0d399d4a127712addf7f310994d098
Reviewed-on: https://gerrit.instructure.com/36726
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Rob Orton <rob@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-06-23 19:33:08 +00:00
James Williams d02c092515 bump moodle2cc version to 0.2.10
closes #CNVS-13513

Change-Id: Ic2bded7075775e75ef61a1001b3adb699d04595b
Reviewed-on: https://gerrit.instructure.com/36628
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Nathan Mills <nathanm@instructure.com>
QA-Review: Nathan Rogowski <nathan@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2014-06-20 20:16:34 +00:00
Jeremy Stanley 28931986c1 go back to random numeric identifiers for answers
test plan:
 - import a quiz containing true/false or multiple-choice questions
 - take the quiz
 - the answers you provided should be recorded and scored properly

fixes CNVS-13623

Change-Id: I761f89ea9fca646ed83523cac48c160d957cc14d
Reviewed-on: https://gerrit.instructure.com/36431
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
Product-Review: Clare Strong <clare@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2014-06-13 23:54:25 +00:00
Rob Orton 16b37757ad translate report titles
fixes CNVS-3134

test plan
 - go to /accounts/self/settings#tab-reports
 - titles should be translatable

Change-Id: I62646bf92fc444bd3166d258566fbd0dc5b2f9c6
Reviewed-on: https://gerrit.instructure.com/34562
Reviewed-by: Nick Cloward <ncloward@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
2014-06-09 20:51:23 +00:00
Rob Orton d644a287d8 allow report titles to be translatable
refs CNVS-3134

test plan
 - go to /accounts/self/settings#tab-reports
 - titles should be translatable

Change-Id: I32d47572929a729e1d5f9dc0a2f20a229005fcca
Reviewed-on: https://gerrit.instructure.com/35827
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
QA-Review: Rob Orton <rob@instructure.com>
2014-06-09 20:04:43 +00:00
James Williams b9fea482af bump moodle2cc to 0.2.9
test plan:
* import the package referenced in the ticket
* should not fail

fixes #CNVS-13417

Change-Id: I1359c789edefa50e78daf2981b15c7823643e3d8
Reviewed-on: https://gerrit.instructure.com/35968
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2014-06-06 15:50:28 +00:00
James Williams abf9d8f0cd assessment question bank migration content selection
test plan:
* should be able to select question banks and quizzes
 separately for migrations in any combination, for
 any package type

closes #CNVS-8526 #CNVS-13333

Change-Id: I566ab00f906369c3c28848b9d8985e7965378d1d
Reviewed-on: https://gerrit.instructure.com/35354
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: Hilary Scharton <hilary@instructure.com>
2014-06-05 19:56:03 +00:00
James Williams 9c70e3e8b4 parse cc assignment extension data
test plan:
* importing the example package with cc assignment data
 should bring in canvas specific assignment data (like grading type)

* cc and canvas package import regressions

closes #CNVS-13270

Change-Id: Ic053837aa7642212bc0360f5e5ecf2cd27a88d9b
Reviewed-on: https://gerrit.instructure.com/35747
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
2014-06-03 20:28:27 +00:00
Rob Orton a585024949 translate course report headers
refs CNVS-3134

test plan
 - course report examples and report headers
   should be translated

Change-Id: I1ed6e93886c281c0f8635aca63171af8966bc58c
Reviewed-on: https://gerrit.instructure.com/34577
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
2014-05-30 20:58:30 +00:00
Rob Orton 0596c963d1 translate grade report headers
refs CNVS-3134

test plan
 - grade report examples and report headers
   should be translated

Change-Id: Ib0ad3f67e990d70372882fa4315245c80500e73a
Reviewed-on: https://gerrit.instructure.com/34579
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
2014-05-30 20:58:23 +00:00
Rob Orton b2351bcd72 translate outcome report headers
refs CNVS-3134

test plan
 - outcome report examples and report headers
   should be translated

Change-Id: I4a9fd3e8b47b2e3b095b9c6160123e088508832c
Reviewed-on: https://gerrit.instructure.com/34581
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
2014-05-30 20:57:36 +00:00
Rob Orton 7243f161c5 translate provisioning report headers
refs CNVS-3134

test plan
 - provisioning report headers should be translated

Change-Id: I457989c7d82dac29cfd565e897ce8b8b8190de61
Reviewed-on: https://gerrit.instructure.com/34590
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
2014-05-30 20:57:27 +00:00
Rob Orton feebbfb36b translate student report headers
refs CNVS-3134

test plan
 - student report examples and report headers
   should be translated

Change-Id: Icc7b20d5120d759eff5707480ba87dabafcc85c9
Reviewed-on: https://gerrit.instructure.com/34591
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
2014-05-30 20:57:19 +00:00
Rob Orton cc1fc91eab create public courses report
closes CNVS-13328

test plan
 - set a course to public
 - run report, it should include the public courses

Change-Id: Ia3ef9ed62604039998bd90ef06337157dc0c5acb
Reviewed-on: https://gerrit.instructure.com/35557
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
2014-05-30 16:45:58 +00:00
James Williams 0b2df86e3f improve moodle 2 handling of missing file references
test plan:
* import the packages referenced in the ticket
* should not fail catastrophically

fixes #CNVS-13226

Change-Id: Ib66ec7c7d5eea3331349f069db6035e592ab84c4
Reviewed-on: https://gerrit.instructure.com/35448
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Nathan Mills <nathanm@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2014-05-28 12:42:31 +00:00
Brian Palmer b42545b038 remove backwards compatible failed_jobs.original_id column
This was deprecated in a previous release.

closes CNVS-12828

test plan: failed jobs should still show in the UI properly and record
their original job id, including in rails3.

Change-Id: I0e8ff9af4e0d0aeb81dada3a91cad56c2b56bdac
Reviewed-on: https://gerrit.instructure.com/34359
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
2014-05-27 23:22:26 +00:00
Rob Orton b080df653a use add extra text helper in reports
refs CNVS-3134

test plan 
 - report extra text should be translated and work

Change-Id: Id4489f386c35f4df999e993306d64a7563573773
Reviewed-on: https://gerrit.instructure.com/34685
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Dave Jungst <dave@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
QA-Review: Rob Orton <rob@instructure.com>
2014-05-22 20:51:40 +00:00
Cody Cutrer 8178266194 split yaml file loading out of Setting
refs CNVS-13024

Setting wasn't properly being initialized as unsharded because
it was loading before Switchman. The reason we need Setting before
switchman is just for yaml loading, so split that into its own
class.

Change-Id: I5456e103cb216dba2d5af4e9c20a697b468c923b
Reviewed-on: https://gerrit.instructure.com/35043
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-05-21 18:27:06 +00:00
Bracken Mosbacker 12ec269bba qti 2 conformance
test plan:
* qti migration regressions

Change-Id: I53587880a591d9ea70e7039d4216770cb1772880
Reviewed-on: https://gerrit.instructure.com/34407
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2014-05-21 15:57:02 +00:00
James Williams 1d7f77d4fc export canvas meta data in qti exports
test plan:
* create a quiz with a description
* export the quiz in a qti export
* import into another course
* should retain the description

fixes #CNVS-8852

Change-Id: I454db916692b6bc58b908322301d5956c99d9901
Reviewed-on: https://gerrit.instructure.com/34886
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
2014-05-20 12:35:36 +00:00
Cody Cutrer 5d4d842ef2 send delayed jobs stats to statsd
closes CNVS-12739

log timing for pops, time spent in queue, time to perform job,
sliced by tag (where applicable), shard, and job shard.

test plan:
 * configure statsd.yml to go to 127.0.0.1 port 7856
 * nc -lu 127.0.0.1 7856
 * run jobs
 * you should see lots of job timings sent to netcat

Change-Id: I60a4b6b10d30edd96011e8e8bc8aa6104dfc6daa
Reviewed-on: https://gerrit.instructure.com/34724
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-05-15 21:16:14 +00:00
Cody Cutrer 267852c7fb include marginalia comment as source when creating job
fixes CNVS-12622

test plan:
 * don't have a config/marginalia.yml
 * queue up a delayed job
 * it should not have a source set
 * configure config/marginalia.yml
 * confirm queries are logged with marginalia info
 * queue up a delayed job
 * it should have source set to the marginalia info

Change-Id: I6460da3f45de5af38282aa5104ec09cd64d233d5
Reviewed-on: https://gerrit.instructure.com/34760
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
2014-05-15 16:49:40 +00:00
Brian Palmer e6a0ae686d renamed failed_jobs original_id
The name conflicts with switchman's aliasing of the un-shareded id
method to original_id. This adds a new column original_job_id and copies
the old column over to it. A subsequent commit will drop the old column.

refs CNVS-12828

test plan: after running migrations, verify that the original job id
shows up for failed jobs in the jobs ui. This won't fix failed jobs that
were recorded in rails3 before this fix, those original ids have been
lost. New jobs that fail in rails3 will now record the original id
properly, though.

Change-Id: Ie974bf3fc932bcef7f09315ca5314e3bdcc6b680
Reviewed-on: https://gerrit.instructure.com/34358
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
2014-05-12 18:58:48 +00:00
James Williams b7740a2c68 bump moodle2cc gem version to 0.2.7
fixes #CNVS-7538 #CNVS-12861 #CNVS-12862 #CNVS-12863 #CNVS-12864 #CNVS-12887

Change-Id: Idcfb3fc2ef895446dcaece594a3d72059623bb0c
Reviewed-on: https://gerrit.instructure.com/34603
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Nathan Mills <nathanm@instructure.com>
QA-Review: Nathan Rogowski <nathan@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2014-05-12 17:13:04 +00:00
James Williams 2ba4531f73 migration refactor: account question banks import
test plan:
* course migration regressions (canvas cc, course copy)

* in addition:
 use the content migrations api to queue a content migration
 for an account ("/accounts/:account_id/content_migrations")
 to import a qti/cc package.
* confirm that the question banks from the package
 that would have been normally imported into a course are now
 imported into the account

closes #CNVS-12529

Change-Id: I2ef306341d2f7defe03c63a981679a3987f1aaa0
Reviewed-on: https://gerrit.instructure.com/34303
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2014-05-12 16:30:10 +00:00