Skip to content

Commit 0193a22

Browse files
Merge pull request #8 from juliosenha/master
Update Version Horse
2 parents cfce0aa + c5a68ba commit 0193a22

File tree

6 files changed

+159
-22
lines changed

6 files changed

+159
-22
lines changed

HandleException.dproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<DCC_CBuilderOutput>All</DCC_CBuilderOutput>
5959
<RuntimeOnlyPackage>true</RuntimeOnlyPackage>
6060
<SanitizedProjectName>HandleException</SanitizedProjectName>
61-
<DCC_UnitSearchPath>modules\.dcp;modules\.dcu;modules;modules\horse\src;modules\jhonson\src;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
61+
<DCC_UnitSearchPath>$(DCC_UnitSearchPath);modules\.dcp;modules\.dcu;modules;modules\horse\src;modules\jhonson\src</DCC_UnitSearchPath>
6262
</PropertyGroup>
6363
<PropertyGroup Condition="'$(Base_Android)'!=''">
6464
<DCC_CBuilderOutput>None</DCC_CBuilderOutput>

Src/Horse.HandleException.pas

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,35 +39,28 @@ procedure HandleException(Req: THorseRequest; Res: THorseResponse; Next: {$IF DE
3939
except
4040
on E: EHorseCallbackInterrupted do
4141
raise;
42-
4342
on E: EHorseException do
4443
begin
4544
LJSON := TJSONObject.Create;
4645
LJSON.{$IF DEFINED(FPC)}Add{$ELSE}AddPair{$ENDIF}('error', E.Error);
47-
4846
if not E.Title.Trim.IsEmpty then
4947
begin
5048
LJSON.{$IF DEFINED(FPC)}Add{$ELSE}AddPair{$ENDIF}('title', E.Title);
5149
end;
52-
5350
if not E.&Unit.Trim.IsEmpty then
5451
begin
5552
LJSON.{$IF DEFINED(FPC)}Add{$ELSE}AddPair{$ENDIF}('unit', E.&Unit);
5653
end;
57-
5854
if E.Code <> 0 then
5955
begin
6056
LJSON.{$IF DEFINED(FPC)}Add{$ELSE}AddPair{$ENDIF}('code', {$IF DEFINED(FPC)}TJSONIntegerNumber{$ELSE}TJSONNumber{$ENDIF}.Create(E.Code));
6157
end;
62-
6358
if E.&Type <> TMessageType.Default then
6459
begin
6560
LJSON.{$IF DEFINED(FPC)}Add{$ELSE}AddPair{$ENDIF}('type', GetEnumName(TypeInfo(TMessageType), Integer(E.&Type)));
6661
end;
67-
6862
SendError(Res, LJSON, E.Code);
6963
end;
70-
7164
on E: Exception do
7265
begin
7366
LJSON := TJSONObject.Create;

boss-lock.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
2-
"hash": "d41d8cd98f00b204e9800998ecf8427e",
3-
"updated": "2019-09-03T14:09:33.1801588-03:00",
2+
"hash": "830981b993a8554a72d15f4378c1a4cc",
3+
"updated": "2020-12-08T14:56:32.3089177-03:00",
44
"installedModules": {
55
"github.com/hashload/horse": {
66
"name": "horse",
7-
"version": "1.7.3",
8-
"hash": "66c1cafebc6ec755c77b01d51d6c76d6",
7+
"version": "v2.0.6",
8+
"hash": "cca1769dfab681cfd26ae8499f9045e1",
99
"artifacts": {},
1010
"failed": false,
1111
"changed": false
1212
},
1313
"github.com/hashload/jhonson": {
1414
"name": "jhonson",
15-
"version": "1.0.4",
16-
"hash": "545935215f295163e4c3927bd21edea2",
15+
"version": "1.0.7",
16+
"hash": "e0a2cfad431f565769ebe2815299924b",
1717
"artifacts": {},
1818
"failed": false,
1919
"changed": false

boss.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"mainsrc": "src/",
77
"projects": [],
88
"dependencies": {
9-
"github.com/hashload/horse": "^1.7.8",
10-
"github.com/hashload/jhonson": "^1.0.5"
9+
"github.com/hashload/horse": "^2.0.0",
10+
"github.com/hashload/jhonson": "^1.0.7"
1111
}
12-
}
12+
}

samples/boss-lock.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
"installedModules": {
55
"github.com/hashload/horse": {
66
"name": "horse",
7-
"version": "v2.0.0",
8-
"hash": "e37b9706c16357ab94219cf12b67b036",
7+
"version": "v2.0.6",
8+
"hash": "cca1769dfab681cfd26ae8499f9045e1",
99
"artifacts": {},
1010
"failed": false,
1111
"changed": false
1212
},
1313
"github.com/hashload/jhonson": {
1414
"name": "jhonson",
15-
"version": "1.0.5",
16-
"hash": "34d01183ef1b6af802c7e132adedeae5",
15+
"version": "1.0.7",
16+
"hash": "e0a2cfad431f565769ebe2815299924b",
1717
"artifacts": {},
1818
"failed": false,
1919
"changed": false

0 commit comments

Comments
 (0)