Skip to content
This repository was archived by the owner on Nov 24, 2020. It is now read-only.

Commit 72fb375

Browse files
VarunramVarunram
authored
return on failing get requests
2 parents 870ada4 + e1e6d39 commit 72fb375

File tree

1 file changed

+60
-30
lines changed

1 file changed

+60
-30
lines changed

‎dashboard/handlers.go‎

Lines changed: 60 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,14 @@ func validateRecp(wg *sync.WaitGroup, username, token string) {
1717

1818
data, err := erpc.GetRequest(platformURL + body)
1919
if err != nil {
20-
log.Fatal(err)
20+
log.Println(err)
21+
return
2122
}
2223

2324
err = json.Unmarshal(data, &Recipient)
2425
if err != nil {
25-
log.Fatal(err)
26+
log.Println(err)
27+
return
2628
}
2729

2830
if Recipient.U != nil {
@@ -47,7 +49,8 @@ func validateRecp(wg *sync.WaitGroup, username, token string) {
4749
var err error
4850
Pnb, err = utils.ToString(primNativeBalance)
4951
if err != nil {
50-
log.Fatal(err)
52+
log.Println(err)
53+
return
5154
}
5255
}(&wg2)
5356

@@ -62,7 +65,8 @@ func validateRecp(wg *sync.WaitGroup, username, token string) {
6265
var err error
6366
Pub, err = utils.ToString(primUsdBalance)
6467
if err != nil {
65-
log.Fatal(err)
68+
log.Println(err)
69+
return
6670
}
6771
}(&wg2)
6872

@@ -77,7 +81,8 @@ func validateRecp(wg *sync.WaitGroup, username, token string) {
7781
var err error
7882
Snb, err = utils.ToString(secNativeBalance)
7983
if err != nil {
80-
log.Fatal(err)
84+
log.Println(err)
85+
return
8186
}
8287
}(&wg2)
8388

@@ -92,7 +97,8 @@ func validateRecp(wg *sync.WaitGroup, username, token string) {
9297
var err error
9398
Sub, err = utils.ToString(secUsdBalance)
9499
if err != nil {
95-
log.Fatal(err)
100+
log.Println(err)
101+
return
96102
}
97103
}(&wg2)
98104

@@ -101,7 +107,8 @@ func validateRecp(wg *sync.WaitGroup, username, token string) {
101107
defer wg.Done()
102108
Return.DABalance.Text, err = utils.ToString(xlm.GetAssetBalance(Recipient.U.StellarWallet.PublicKey, Project.DebtAssetCode))
103109
if err != nil {
104-
log.Fatal(err)
110+
log.Println(err)
111+
return
105112
}
106113
}(&wg2)
107114

@@ -110,7 +117,8 @@ func validateRecp(wg *sync.WaitGroup, username, token string) {
110117
defer wg.Done()
111118
Return.PBBalance.Text, err = utils.ToString(xlm.GetAssetBalance(Recipient.U.StellarWallet.PublicKey, Project.PaybackAssetCode))
112119
if err != nil {
113-
log.Fatal(err)
120+
log.Println(err)
121+
return
114122
}
115123
}(&wg2)
116124

@@ -128,17 +136,20 @@ func adminTokenHandler(wg *sync.WaitGroup, index int) {
128136
var projCount length
129137
data, err := erpc.GetRequest(platformURL + "/admin/getallprojects?username=admin&token=" + AdminToken)
130138
if err != nil {
131-
log.Fatal(err)
139+
log.Println(err)
140+
return
132141
}
133142

134143
err = json.Unmarshal(data, &projCount)
135144
if err != nil {
136-
log.Fatal(err)
145+
log.Println(err)
146+
return
137147
}
138148

139149
Return.ProjCount.Text, err = utils.ToString(projCount.Length)
140150
if err != nil {
141-
log.Fatal(err)
151+
log.Println(err)
152+
return
142153
}
143154

144155
Return.ProjCount.Link = platformURL + "/admin/getallprojects?username=admin&token=" + AdminToken
@@ -150,17 +161,20 @@ func adminTokenHandler(wg *sync.WaitGroup, index int) {
150161
var userCount length
151162
data, err := erpc.GetRequest(platformURL + "/admin/getallusers?username=admin&token=" + AdminToken)
152163
if err != nil {
153-
log.Fatal(err)
164+
log.Println(err)
165+
return
154166
}
155167

156168
err = json.Unmarshal(data, &userCount)
157169
if err != nil {
158-
log.Fatal(err)
170+
log.Println(err)
171+
return
159172
}
160173

161174
Return.UserCount.Text, err = utils.ToString(userCount.Length)
162175
if err != nil {
163-
log.Fatal(err)
176+
log.Println(err)
177+
return
164178
}
165179

166180
Return.UserCount.Link = platformURL + "/admin/getallusers?username=admin&token=" + AdminToken
@@ -172,17 +186,20 @@ func adminTokenHandler(wg *sync.WaitGroup, index int) {
172186
var userCount length
173187
data, err := erpc.GetRequest(platformURL + "/admin/getallinvestors?username=admin&token=" + AdminToken)
174188
if err != nil {
175-
log.Fatal(err)
189+
log.Println(err)
190+
return
176191
}
177192

178193
err = json.Unmarshal(data, &userCount)
179194
if err != nil {
180-
log.Fatal(err)
195+
log.Println(err)
196+
return
181197
}
182198

183199
Return.InvCount.Text, err = utils.ToString(userCount.Length)
184200
if err != nil {
185-
log.Fatal(err)
201+
log.Println(err)
202+
return
186203
}
187204

188205
Return.InvCount.Link = platformURL + "/admin/getallinvestors?username=admin&token=" + AdminToken
@@ -194,37 +211,43 @@ func adminTokenHandler(wg *sync.WaitGroup, index int) {
194211
var userCount length
195212
data, err := erpc.GetRequest(platformURL + "/admin/getallrecipients?username=admin&token=" + AdminToken)
196213
if err != nil {
197-
log.Fatal(err)
214+
log.Println(err)
215+
return
198216
}
199217

200218
err = json.Unmarshal(data, &userCount)
201219
if err != nil {
202-
log.Fatal(err)
220+
log.Println(err)
221+
return
203222
}
204223

205224
Return.RecpCount.Text, err = utils.ToString(userCount.Length)
206225
if err != nil {
207-
log.Fatal(err)
226+
log.Println(err)
227+
return
208228
}
209229

210230
Return.RecpCount.Link = platformURL + "/admin/getallrecipients?username=admin&token=" + AdminToken
211231
}(&wg2)
212232

213233
indexS, err := utils.ToString(index)
214234
if err != nil {
215-
log.Fatal(err)
235+
log.Println(err)
236+
return
216237
}
217238

218239
body := "/project/get?index=" + indexS
219240

220241
data, err := erpc.GetRequest(platformURL + body)
221242
if err != nil {
222-
log.Fatal(err)
243+
log.Println(err)
244+
return
223245
}
224246

225247
err = json.Unmarshal(data, &Project)
226248
if err != nil {
227-
log.Fatal(err)
249+
log.Println(err)
250+
return
228251
}
229252

230253
wg2.Add(1)
@@ -237,7 +260,8 @@ func adminTokenHandler(wg *sync.WaitGroup, index int) {
237260

238261
escrowBalanceS, err := utils.ToString(escrowBalance)
239262
if err != nil {
240-
log.Fatal(err)
263+
log.Println(err)
264+
return
241265
}
242266

243267
Return.EscrowBalance.Text = escrowBalanceS
@@ -246,12 +270,14 @@ func adminTokenHandler(wg *sync.WaitGroup, index int) {
246270

247271
invIndex, err := utils.ToString(Project.InvestorIndices[0])
248272
if err != nil {
249-
log.Fatal(err)
273+
log.Println(err)
274+
return
250275
}
251276

252277
devIndex, err := utils.ToString(Project.DeveloperIndices[0])
253278
if err != nil {
254-
log.Fatal(err)
279+
log.Println(err)
280+
return
255281
}
256282

257283
wg2.Add(1)
@@ -267,13 +293,15 @@ func getInvestor(wg *sync.WaitGroup, AdminToken string, invIndex string) {
267293
data, err := erpc.GetRequest(platformURL + "/admin/getinvestor?username=admin&token=" +
268294
AdminToken + "&index=" + invIndex)
269295
if err != nil {
270-
log.Fatal(err)
296+
log.Println(err)
297+
return
271298
}
272299

273300
var investor core.Investor
274301
err = json.Unmarshal(data, &investor)
275302
if err != nil {
276-
log.Fatal(err)
303+
log.Println(err)
304+
return
277305
}
278306

279307
Return.Investor.Name = investor.U.Name
@@ -286,13 +314,15 @@ func getDeveloper(wg *sync.WaitGroup, AdminToken string, devIndex string) {
286314
data, err := erpc.GetRequest(platformURL + "/admin/getentity?username=admin&token=" +
287315
AdminToken + "&index=" + devIndex)
288316
if err != nil {
289-
log.Fatal(err)
317+
log.Println(err)
318+
return
290319
}
291320

292321
var developer core.Entity
293322
err = json.Unmarshal(data, &developer)
294323
if err != nil {
295-
log.Fatal(err)
324+
log.Println(err)
325+
return
296326
}
297327

298328
Return.Developer.Name = developer.U.Name

0 commit comments

Comments
 (0)