Skip to content

Commit

Permalink
La till väntetid för misslyckat anrop till Users.list i funktionen ge…
Browse files Browse the repository at this point in the history
…tGoogleAccount för att testa igen
  • Loading branch information
webbmastern committed Jun 29, 2019
1 parent bb2c5ab commit bd325e2
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 21 deletions.
1 change: 0 additions & 1 deletion Gemensamma_funktioner.gs
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,6 @@ String.prototype.endsWith = function(suffix) {
return this.lastIndexOf(suffix) === this.length - suffix.length;
}


/**
* Ersätt specialtecken med deras engelska bokstavsmotsvarigheter
* https://stackoverflow.com/questions/18123501/replacing-accented-characters-with-plain-ascii-ones
Expand Down
54 changes: 34 additions & 20 deletions Grupper.gs
Original file line number Diff line number Diff line change
Expand Up @@ -325,27 +325,41 @@ function getGoogleAccount(member_no) {
var users;

var qry = "externalId='"+ member_no +"'";
var pageToken, page;
do {
page = AdminDirectory.Users.list({
domain: domain,
query: qry,
orderBy: 'givenName',
maxResults: 150,
pageToken: pageToken
});
users = page.users;
if (users) {

for (var n=0; n<6; n++) {
Logger.log("Funktionen getGoogleAcount körs " + n);
try {

//Logger.log('%s (%s)', users[0].name.fullName, users[0].primaryEmail);
return users[0].primaryEmail;

} else {
//Logger.log('Inga användare hittades.');
return "";
}
pageToken = page.nextPageToken;
} while (pageToken);
var pageToken, page;
do {
page = AdminDirectory.Users.list({
domain: domain,
query: qry,
orderBy: 'givenName',
maxResults: 150,
pageToken: pageToken
});
users = page.users;
if (users) {

//Logger.log('%s (%s)', users[0].name.fullName, users[0].primaryEmail);
return users[0].primaryEmail;

} else {
//Logger.log('Inga användare hittades.');
return "";
}
pageToken = page.nextPageToken;
} while (pageToken);

} catch(e) {
Logger.log("Problem med att anropa GoogleTjänst Users.list i funktionen getGoogleAccount");
if (n == 5) {
throw e;
}
Utilities.sleep((Math.pow(2,n)*1000) + (Math.round(Math.random() * 1000)));
}
}
}


Expand Down

0 comments on commit bd325e2

Please sign in to comment.