mirror of
https://we.phorge.it/source/phorge.git
synced 2024-11-23 15:22:41 +01:00
74d5ae7bec
Summary: Two minor issues that I caught in the log while fixing Phame permissions: - We had a JS bug which would cause us to immediately generate two comment previews at the exact same time -- one for loading the page, and one for "switching to desktop". Instead, only generate the "switch to desktop" preview if we really switched to desktop from a different device layout. - These two requests could end up reading/writing the VersionedDraft table at exactly the same time fairly often (e.g., after a comment submission, the page would load, send two preview requests at exactly the same time, and they'd race fairly reliably for me locally). If we do race, recover from the race. Test Plan: Submitted some Phame comments. - No more error log errors about VersionedDraft keys. - Saw only one preview request when loading the page instead of two. Here's the specific stack trace I caught: ``` [Mon Sep 05 12:15:33.639930 2016] [:error] [pid 50608] [client 127.0.0.1:55278] [2016-09-05 14:15:33] EXCEPTION: (AphrontDuplicateKeyQueryException) #1062: Duplicate entry 'PHID-POST-fknnpzjnsdgc3rqobhst-PHID-USER-pr5rjpuilpfserepsd2k-13' for key 'key_object' at [<phutil>/src/aphront/storage/connection/mysql/AphrontBaseMySQLDatabaseConnection.php:314] [Mon Sep 05 12:15:33.640801 2016] [:error] [pid 50608] [client 127.0.0.1:55278] arcanist(head=master, ref.master=9e82ef979e81), corgi(head=master, ref.master=5b9171222bc9), instances(head=stable, ref.master=485bc8128198, ref.stable=2983bc917601), ledger(head=master, ref.master=4da4a24b8779), libcore(), phabricator(head=phame2, ref.master=4b6da9735ba7, ref.phame2=4b6da9735ba7), phutil(head=stable, ref.master=97f05269fdb1, ref.stable=c14343ee620e), services(head=stable, ref.master=1fcb5cdb7582, ref.stable=2d8088a5b4b3) [Mon Sep 05 12:15:33.640815 2016] [:error] [pid 50608] [client 127.0.0.1:55278] #0 <#2> AphrontBaseMySQLDatabaseConnection::throwCommonException(integer, string) called at [<phutil>/src/aphront/storage/connection/mysql/AphrontBaseMySQLDatabaseConnection.php:348] [Mon Sep 05 12:15:33.640830 2016] [:error] [pid 50608] [client 127.0.0.1:55278] #1 <#2> AphrontBaseMySQLDatabaseConnection::throwQueryCodeException(integer, string) called at [<phutil>/src/aphront/storage/connection/mysql/AphrontBaseMySQLDatabaseConnection.php:289] [Mon Sep 05 12:15:33.640833 2016] [:error] [pid 50608] [client 127.0.0.1:55278] #2 <#2> AphrontBaseMySQLDatabaseConnection::throwQueryException(mysqli) called at [<phutil>/src/aphront/storage/connection/mysql/AphrontBaseMySQLDatabaseConnection.php:185] [Mon Sep 05 12:15:33.640836 2016] [:error] [pid 50608] [client 127.0.0.1:55278] #3 <#2> AphrontBaseMySQLDatabaseConnection::executeRawQuery(string) called at [<phutil>/src/xsprintf/queryfx.php:8] [Mon Sep 05 12:15:33.640839 2016] [:error] [pid 50608] [client 127.0.0.1:55278] #4 <#2> queryfx(AphrontMySQLiDatabaseConnection, string, string, string, array, string) [Mon Sep 05 12:15:33.640841 2016] [:error] [pid 50608] [client 127.0.0.1:55278] #5 <#2> call_user_func_array(string, array) called at [<phutil>/src/aphront/storage/connection/AphrontDatabaseConnection.php:42] [Mon Sep 05 12:15:33.640844 2016] [:error] [pid 50608] [client 127.0.0.1:55278] #6 <#2> AphrontDatabaseConnection::query(string, string, string, array, string) called at [<phabricator>/src/infrastructure/storage/lisk/LiskDAO.php:1261] [Mon Sep 05 12:15:33.640846 2016] [:error] [pid 50608] [client 127.0.0.1:55278] #7 <#2> LiskDAO::insertRecordIntoDatabase(string) called at [<phabricator>/src/infrastructure/storage/lisk/LiskDAO.php:1106] [Mon Sep 05 12:15:33.640849 2016] [:error] [pid 50608] [client 127.0.0.1:55278] #8 <#2> LiskDAO::insert() called at [<phabricator>/src/infrastructure/storage/lisk/LiskDAO.php:1075] [Mon Sep 05 12:15:33.640851 2016] [:error] [pid 50608] [client 127.0.0.1:55278] #9 <#2> LiskDAO::save() called at [<phabricator>/src/applications/draft/storage/PhabricatorVersionedDraft.php:65] [Mon Sep 05 12:15:33.640854 2016] [:error] [pid 50608] [client 127.0.0.1:55278] #10 <#2> PhabricatorVersionedDraft::loadOrCreateDraft(string, string, integer) called at [<phabricator>/src/applications/transactions/editengine/PhabricatorEditEngine.php:1669] [Mon Sep 05 12:15:33.640857 2016] [:error] [pid 50608] [client 127.0.0.1:55278] #11 <#2> PhabricatorEditEngine::buildCommentResponse(PhamePost) called at [<phabricator>/src/applications/transactions/editengine/PhabricatorEditEngine.php:894] [Mon Sep 05 12:15:33.640859 2016] [:error] [pid 50608] [client 127.0.0.1:55278] #12 <#2> PhabricatorEditEngine::buildResponse() called at [<phabricator>/src/applications/phame/controller/post/PhamePostEditController.php:60] [Mon Sep 05 12:15:33.640862 2016] [:error] [pid 50608] [client 127.0.0.1:55278] #13 <#2> PhamePostEditController::handleRequest(AphrontRequest) called at [<phabricator>/src/aphront/configuration/AphrontApplicationConfiguration.php:237] [Mon Sep 05 12:15:33.640865 2016] [:error] [pid 50608] [client 127.0.0.1:55278] #14 phlog(AphrontDuplicateKeyQueryException) called at [<phabricator>/src/aphront/handler/PhabricatorAjaxRequestExceptionHandler.php:27] [Mon Sep 05 12:15:33.640868 2016] [:error] [pid 50608] [client 127.0.0.1:55278] #15 PhabricatorAjaxRequestExceptionHandler::handleRequestException(AphrontRequest, AphrontDuplicateKeyQueryException) called at [<phabricator>/src/aphront/configuration/AphrontApplicationConfiguration.php:644] [Mon Sep 05 12:15:33.640870 2016] [:error] [pid 50608] [client 127.0.0.1:55278] #16 AphrontApplicationConfiguration::handleException(AphrontDuplicateKeyQueryException) called at [<phabricator>/src/aphront/configuration/AphrontApplicationConfiguration.php:242] [Mon Sep 05 12:15:33.640873 2016] [:error] [pid 50608] [client 127.0.0.1:55278] #17 AphrontApplicationConfiguration::processRequest(AphrontRequest, PhutilDeferredLog, AphrontPHPHTTPSink, MultimeterControl) called at [<phabricator>/src/aphront/configuration/AphrontApplicationConfiguration.php:149] [Mon Sep 05 12:15:33.640879 2016] [:error] [pid 50608] [client 127.0.0.1:55278] #18 AphrontApplicationConfiguration::runHTTPRequest(AphrontPHPHTTPSink) called at [<phabricator>/webroot/index.php:17] ``` Reviewers: chad Reviewed By: chad Differential Revision: https://secure.phabricator.com/D16494
210 lines
4.6 KiB
JavaScript
210 lines
4.6 KiB
JavaScript
/**
|
|
* @provides javelin-behavior-comment-actions
|
|
* @requires javelin-behavior
|
|
* javelin-stratcom
|
|
* javelin-workflow
|
|
* javelin-dom
|
|
* phuix-form-control-view
|
|
* phuix-icon-view
|
|
* javelin-behavior-phabricator-gesture
|
|
*/
|
|
|
|
JX.behavior('comment-actions', function(config) {
|
|
var action_map = config.actions;
|
|
|
|
var action_node = JX.$(config.actionID);
|
|
var form_node = JX.$(config.formID);
|
|
var input_node = JX.$(config.inputID);
|
|
var place_node = JX.$(config.placeID);
|
|
|
|
var rows = {};
|
|
|
|
JX.DOM.listen(action_node, 'change', null, function() {
|
|
var option = find_option(action_node.value);
|
|
|
|
action_node.value = '+';
|
|
|
|
if (option) {
|
|
add_row(option);
|
|
}
|
|
});
|
|
|
|
function find_option(key) {
|
|
var options = action_node.options;
|
|
var option;
|
|
|
|
for (var ii = 0; ii < options.length; ii++) {
|
|
option = options[ii];
|
|
if (option.value == key) {
|
|
return option;
|
|
}
|
|
}
|
|
|
|
return null;
|
|
}
|
|
|
|
function add_row(option) {
|
|
var action = action_map[option.value];
|
|
if (!action) {
|
|
return;
|
|
}
|
|
|
|
option.disabled = true;
|
|
|
|
var icon = new JX.PHUIXIconView()
|
|
.setIcon('fa-times-circle');
|
|
var remove = JX.$N('a', {href: '#'}, icon.getNode());
|
|
|
|
var control = new JX.PHUIXFormControl()
|
|
.setLabel(action.label)
|
|
.setError(remove)
|
|
.setControl(action.type, action.spec);
|
|
var node = control.getNode();
|
|
|
|
JX.Stratcom.addSigil(node, 'touchable');
|
|
|
|
var remove_action = function() {
|
|
JX.DOM.remove(node);
|
|
delete rows[action.key];
|
|
option.disabled = false;
|
|
};
|
|
|
|
JX.DOM.listen(node, 'gesture.swipe.end', null, function(e) {
|
|
var data = e.getData();
|
|
|
|
if (data.direction != 'left') {
|
|
// Didn't swipe left.
|
|
return;
|
|
}
|
|
|
|
if (data.length <= (JX.Vector.getDim(node).x / 2)) {
|
|
// Didn't swipe far enough.
|
|
return;
|
|
}
|
|
|
|
remove_action();
|
|
});
|
|
|
|
rows[action.key] = control;
|
|
|
|
JX.DOM.listen(remove, 'click', null, function(e) {
|
|
e.kill();
|
|
remove_action();
|
|
});
|
|
|
|
place_node.parentNode.insertBefore(node, place_node);
|
|
|
|
return control;
|
|
}
|
|
|
|
function serialize_actions() {
|
|
var data = [];
|
|
|
|
for (var k in rows) {
|
|
data.push({
|
|
type: k,
|
|
value: rows[k].getValue(),
|
|
initialValue: action_map[k].initialValue || null
|
|
});
|
|
}
|
|
|
|
return JX.JSON.stringify(data);
|
|
}
|
|
|
|
function get_data() {
|
|
var data = JX.DOM.convertFormToDictionary(form_node);
|
|
|
|
data.__preview__ = 1;
|
|
data[input_node.name] = serialize_actions();
|
|
|
|
return data;
|
|
}
|
|
|
|
function restore_draft_actions(drafts) {
|
|
var draft;
|
|
var option;
|
|
var control;
|
|
|
|
for (var ii = 0; ii < drafts.length; ii++) {
|
|
draft = drafts[ii];
|
|
|
|
option = find_option(draft);
|
|
if (!option) {
|
|
continue;
|
|
}
|
|
|
|
control = add_row(option);
|
|
}
|
|
}
|
|
|
|
function onresponse(response) {
|
|
if (JX.Device.getDevice() != 'desktop') {
|
|
return;
|
|
}
|
|
|
|
var panel = JX.$(config.panelID);
|
|
if (!response.xactions.length) {
|
|
JX.DOM.hide(panel);
|
|
} else {
|
|
JX.DOM.setContent(
|
|
JX.$(config.timelineID),
|
|
JX.$H(response.xactions.join('')));
|
|
JX.DOM.show(panel);
|
|
}
|
|
}
|
|
|
|
JX.DOM.listen(form_node, ['submit', 'didSyntheticSubmit'], null, function() {
|
|
input_node.value = serialize_actions();
|
|
});
|
|
|
|
if (config.showPreview) {
|
|
var request = new JX.PhabricatorShapedRequest(
|
|
config.actionURI,
|
|
onresponse,
|
|
get_data);
|
|
|
|
var trigger = JX.bind(request, request.trigger);
|
|
|
|
JX.DOM.listen(form_node, 'keydown', null, trigger);
|
|
|
|
var always_trigger = function() {
|
|
new JX.Request(config.actionURI, onresponse)
|
|
.setData(get_data())
|
|
.send();
|
|
};
|
|
|
|
JX.DOM.listen(form_node, 'shouldRefresh', null, always_trigger);
|
|
request.start();
|
|
|
|
var old_device = JX.Device.getDevice();
|
|
|
|
var ondevicechange = function() {
|
|
var new_device = JX.Device.getDevice();
|
|
|
|
var panel = JX.$(config.panelID);
|
|
if (new_device == 'desktop') {
|
|
request.setRateLimit(500);
|
|
|
|
// Force an immediate refresh if we switched from another device type
|
|
// to desktop.
|
|
if (old_device != new_device) {
|
|
always_trigger();
|
|
}
|
|
} else {
|
|
// On mobile, don't show live previews and only save drafts every
|
|
// 10 seconds.
|
|
request.setRateLimit(10000);
|
|
JX.DOM.hide(panel);
|
|
}
|
|
|
|
old_device = new_device;
|
|
};
|
|
|
|
ondevicechange();
|
|
|
|
JX.Stratcom.listen('phabricator-device-change', null, ondevicechange);
|
|
}
|
|
|
|
restore_draft_actions(config.drafts || []);
|
|
|
|
});
|