From 798098ba0218f4793b1f34c3120ed2aa4c279ce7 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Wed, 28 Mar 2018 14:55:46 +0200 Subject: [PATCH] create Folder now dealing with Timeouts of all kind --- .vs/AACloud/v15/.suo | Bin 90112 -> 91648 bytes File Storage.js | 45 +++++++++++++++++++++++++++++++++++++------ 2 files changed, 39 insertions(+), 6 deletions(-) diff --git a/.vs/AACloud/v15/.suo b/.vs/AACloud/v15/.suo index c068d6322f1e7f90dc57bf69e0df6c41e4a8a3a7..5c32bcd4faed8cba112ac2bcac4f119c7a8186f1 100644 GIT binary patch delta 1771 zcmai!e@v8h9LMkTeVzj@&$C036DS@K5e4-$3^dRKPCz6C#H__akc!BV;EZN#T(0>C zG6&D6ajc*Cv=SMi-j~F++yq(6GPTW^Q%J1MKgtX-Qa0uKeBl9!T0Prq@9*cw_wzj8 z_r7=TQ%3h$V?$EVY=gld5o11|k7Rtk=vZDT^Rqi@hVd(`VtZi&A7K)}SsazZYvZYF zJwY3MQKU(Pm2m30M@eIdqr^O71F@C}Bkt3l1*B!f6U1WTMMBI{NOOrmLVS&xbQY09 zi29rfwTQJZgo33afuG0=Yei-*MYf3+5&D9strKV+Nyvo1o?oVGI%yh_O@tH4goO|@ zvUH6g%_JVtV^I@N{zN?6w}lp4^&&4Y+Q84=Q~l>Z-1A>tyNbGmYht@_Z5{Er9t+ow z5yCZ5pL9*Eg=tmzSDa!RQ3K0+oA^4S;sY}=0c@HN`I zU8-XXhW2db**!n|&B%PyX__@ecS~Gai@}2tSBf$AP6D?08lYu73jf`~+b@PmSbXU_ zXr@$(cG>d(d$9dtEOz%RT=``XJO>%<;dwvo1NG)fc<`2@kv6oZEWn|@OH<>Exib6# zd(gy-Mh-F@x@^MAJJEc_-5U@jF3aTe9xbedQw-qu@0mgT(5D`o0hqzynu-mEnH#>B ztlG4)_yZ34{3=8kn*zb)xh6p{SH?QnzcwwEFl^v(m)8vY#cR6OTc8_I=`-=LD>=}$ z%?gKElLbt8>*jLI{dE;qTva`T64*R*gWxyMg&-<54#fX$E2i|>@XebKb;a7?96VfA zU6{T5rRu`!UAwDxJYQJ#X$Y|Y7ZtJ~6v3J4>%Rcfg=?Sy delta 1859 zcma)+4@}f$7{~8YD{DQC9Y zlo@x=^qlJt{-);AOz+*iS~a=Et>quGLKv`c$v1aSHefB)>^FGh> z`@P>i@6UNoS^iG-C%CJG3VHg@>g2aa(+-P!CEK!+?r}TlkmZjH9wxQtIoHKCcb6f8(XsD%Jx~jb>{Ub{prevVE5?86M1iQ zwq!)@-6%1Xa*jv8M_(ocJx+Fn`^y)Cw?dXsE-~S!u{oL&P^osJt9mAORHve~^dqwJ zC}t+nx=5+kE6*^cj(PLDAhLnFh*1yA5EZ__6!X+BhHc!r-U;4C7SKTr#p=f8qQlar zY-ZkenQ?gmDN@FiCgyIS^J1X>Y^0b|F(TpK+Gbi@WBis&%e>DoktA`q!kg%5s)(FO z0dc|Z1c#a`Br%TYH|C&Y%TX>n={*kSec7r-t0NCvwthLb*V^XYMduO9B;3>CwTehF z++t?KZMmbp4V2fJ(#G6dt)dTa*|A)Wr?(fo(~R7>_dB)M-38dSyGVIc@*V(&yN{gZ z=MEQuR{?2k@y@ygxQ1rG13S&n;jn)dZ~Wwx_Mf58+I3L@8fbAXVpJWN@lCBqj)oH6 z)03*kv|c-Q4o|?`>n8l|>+`Tn>|-F9i@x4PN?*+VN~-|<-_p?k+7H;@vzj}5Hvu)9 zhqafIF?rws+RjO7Ss33clN8@@)lpLGpB~LFS1g$Jqa_VY<>S z`qJj+4b6^|dMIGb4!$`t;0K*}5u?lS%E^f^tae|TixpS%eQV>u1D;q76yM3j+TIM@ zGVlO?b=%^5Dht{`Q$xS;7TlIui9fB0^VO%oKDejBp)}CmTb2Yn!57GehqXVdkkR0Q+@QWS_hqf1K2cb^Z)<= diff --git a/File Storage.js b/File Storage.js index 804cfc220..9ab17e48f 100644 --- a/File Storage.js +++ b/File Storage.js @@ -111,16 +111,49 @@ exports.newFileStorage = function newFileStorage(BOT) { fileService.createDirectoryIfNotExists(shareName, pFolderPath, onFolderCreated); - function onFolderCreated(err) { + function onFolderCreated(err, result, response) { if (err) { - logger.write("[ERROR] createFolder -> onFolderCreated -> err = " + err.message); - logger.write("[ERROR] createFolder -> onFolderCreated -> shareName = " + shareName); - logger.write("[ERROR] createFolder -> onFolderCreated -> pFolderPath = " + pFolderPath); + + logger.write("[ERROR] createFolder -> onFolderCreated -> err = " + JSON.stringify(err)); + logger.write("[ERROR] createFolder -> onFolderCreated -> result = " + JSON.stringify(result)); + logger.write("[ERROR] createFolder -> onFolderCreated -> response = " + JSON.stringify(response)); + + if (err.message.indexOf("The server is busy") > 0 + || err.code === 'ECONNRESET' + || err.code === 'ENOTFOUND' + || err.code === 'ESOCKETTIMEDOUT' + || err.code === 'ETIMEDOUT') { + + setTimeout(secondTry, 1000); + return; + + function secondTry() { + + logger.write("[INFO] createFolder -> onFolderCreated -> secondTry -> Retrying to create the folder."); + + fileService.createDirectoryIfNotExists(shareName, pFolderPath, onSecondTry); + + function onSecondTry(err, result, response) { + + if (err) { + logger.write("[ERROR] createFolder -> onFolderCreated -> secondTry -> Folder not created. Giving Up."); + callBackFunction(global.DEFAULT_RETRY_RESPONSE); + } else { + logger.write("[INFO] createFolder -> onFolderCreated -> secondTry -> Folder succesfully created on second try."); + callBackFunction(global.DEFAULT_OK_RESPONSE); + } + } + } + } + + logger.write("[ERROR] createFolder -> onFolderCreated -> Dont know what to do here. Cancelling operation. "); callBackFunction(global.DEFAULT_FAIL_RESPONSE); - return; + + } else { + if (FULL_LOG === true) { logger.write("[INFO] createFolder -> onFolderCreated -> File Created."); } + callBackFunction(global.DEFAULT_OK_RESPONSE); } - callBackFunction(global.DEFAULT_OK_RESPONSE); } } catch (err) {