Commit graph

795 commits

Author SHA1 Message Date
Ryan Huffman
d140ccb790 Fix constexpr compile error on Windows 2018-03-15 14:52:15 -07:00
Ryan Huffman
9275fe1f7d Update backup downloads to use .content.zip extension 2018-03-15 12:47:51 -07:00
Ryan Huffman
bee8899c46 Add support for uploading .content.zip files 2018-03-15 12:17:21 -07:00
Clément Brisset
b7ac07f590
Merge pull request #12589 from highfidelity/RC65
merge back RC65 to master after RC hotfixes
2018-03-07 17:22:41 -08:00
John Conklin II
e0a11271bf
Merge pull request #12573 from birarda/bug/domain-settings-metaverse
fix for getSetting QVariant ref in DomainServer
2018-03-07 12:11:45 -08:00
Stephen Birarda
a83b54e10d fix for getSetting QVariant ref in DomainServer 2018-03-06 13:55:50 -08:00
Atlante45
a23884d0e0 Prevent crash during long backup web requests 2018-03-06 13:21:02 -08:00
Atlante45
85b4c3b422 Protect session UUID from concurrent read/writes 2018-03-02 17:34:18 -08:00
Stephen Birarda
2af0e5fc2b
Merge pull request #12501 from huffman/feat/content-settings
Code review changes
2018-02-26 17:58:08 -07:00
Ryan Huffman
ec210e1750 Move OctreeUtils to OctreeDataUtils 2018-02-26 16:51:42 -08:00
Ryan Huffman
3fa538d42d Add RawEntityData subclass 2018-02-26 16:32:09 -08:00
Stephen Birarda
2872412f9c fixes for comments from code reviews 2018-02-26 14:35:34 -08:00
Ryan Huffman
dbfbee5406 CR 2018-02-26 13:53:20 -08:00
Stephen Birarda
946474c615 do not init caching for asset requests in domain-server 2018-02-21 16:33:58 -08:00
Stephen Birarda
1e36a5b218
Merge pull request #12430 from birarda/feat/pending-content-archives
make filename regex less restrictive
2018-02-16 18:21:56 -07:00
Stephen Birarda
2faa67c68d make filename regex less restrictive 2018-02-16 17:01:46 -08:00
Atlante45
acc68d65c2 Backup bug fixes 2018-02-16 16:59:12 -08:00
Stephen Birarda
1c053730eb make DomainServerSettingsManager thread-safe for use in content backup 2018-02-16 16:01:40 -08:00
Stephen Birarda
8e621a95a3 fix typo in debug for writing new entities 2018-02-16 16:01:40 -08:00
Stephen Birarda
441b55301f cleanup LNL last during DS shutdown 2018-02-16 16:01:40 -08:00
Stephen Birarda
494f93304b take down AssetClient after content manager 2018-02-16 16:01:40 -08:00
Stephen Birarda
de75fe8e9f CR fix for typo in comment 2018-02-16 15:37:14 -08:00
Stephen Birarda
2020ce5907 add API to recover from content archive 2018-02-16 15:37:14 -08:00
Stephen Birarda
910f3425f8 fix latest backup refreshing with no caching 2018-02-16 15:34:55 -08:00
Stephen Birarda
b019895fce handle entity file upload from new content upload 2018-02-16 15:34:55 -08:00
Stephen Birarda
dd5a705836 move rolling interval backup rules to automatic content archives 2018-02-16 15:34:55 -08:00
Ryan Huffman
0230abea79 Fix backup loading not getting auto backups 2018-02-16 13:54:35 -08:00
Ryan Huffman
2942a53a1d Add recovery mode and full backup information to DS 2018-02-15 16:47:48 -08:00
Ryan Huffman
dd0b8a0c2f Add backup download API to DS 2018-02-15 16:47:23 -08:00
Ryan Huffman
9e99c5c744 Add restart of ES during backup recovery 2018-02-15 16:47:23 -08:00
Stephen Birarda
f5cad5683d make sure backup handlers end up on the correct thread 2018-02-15 15:39:25 -08:00
Stephen Birarda
f624e1b464 add a content settings backup handler 2018-02-15 15:10:51 -08:00
Atlante45
9fca92facd Move EntitiesBackupHandler to its own file 2018-02-15 11:28:52 -08:00
Atlante45
d8d05fe045 Rename backup supervisor 2018-02-15 11:27:21 -08:00
Atlante45
ce93b9a1f4 Simplify BackupHandler pattern 2018-02-15 11:27:20 -08:00
Ryan Huffman
efb2473fcf Updaet createManualBackup to defer response until creation is done 2018-02-15 11:02:55 -08:00
Ryan Huffman
b6240e8622 Move backup recover API to POST 2018-02-15 10:22:35 -08:00
Ryan Huffman
8a69c69bec CR 2018-02-15 10:22:35 -08:00
Ryan Huffman
dd398da2e0 Update DS to use promises for backup APIs 2018-02-15 10:22:35 -08:00
Ryan Huffman
8b07e7e28f Add backup DS APIs
Add backup apis
2018-02-15 10:22:35 -08:00
Ryan Huffman
e63b692d80 Add BackupHandler for entity file backups 2018-02-15 10:22:35 -08:00
Atlante45
69298246c4 CR 2018-02-15 10:09:21 -08:00
Atlante45
a6447da64c More Asset Backup work 2018-02-15 10:09:21 -08:00
Atlante45
11b7fb89a9 Integrate new backup systems 2018-02-15 10:09:21 -08:00
Ryan Huffman
0bbbff95cd Fix replacement octree data not working 2018-02-15 10:09:21 -08:00
Ryan Huffman
2a667fcd60 Cleanup entity -> ds persist 2018-02-15 10:09:21 -08:00
Ryan Huffman
ff5be2d690 Fix entity data ID sometimes being reset 2018-02-15 10:09:20 -08:00
Ryan Huffman
cb9327e030 Add entity file sync and domain content backups 2018-02-15 10:09:20 -08:00
Stephen Birarda
6240181474 initial separation of content settings and domain settings 2018-02-14 12:09:56 -08:00
Atlante45
87f77b6257 Asset Server Backup 2018-02-09 11:32:42 -08:00