persist pull streams

add pull stream demon
2019-01-06 19:13:33 +08:00 · 2019-01-06 19:13:33 +08:00 · 34d11b4ffb
parent 3de6502dda
commit 34d11b4ffb
16 changed files with 17 additions and 1432 deletions
--- a/easydarwin.ini
+++ b/easydarwin.ini
@ -13,13 +13,17 @@ timeout=28800
 gop_cache_enable=1

 ; 是否使能推送的同事进行本地存储，使能后则可以进行录像查询与回放。
-save_stream_to_local=0
+save_stream_to_local=1

 ;easydarwin使用ffmpeg工具来进行存储。这里表示ffmpeg的可执行程序的路径
-ffmpeg_path=~/Downloads/ffmpeg-20180719-9cb3d8f-macos64-shared/bin/ffmpeg
+ffmpeg_path=/Users/ze/Downloads/ffmpeg-20180719-9cb3d8f-macos64-shared/bin/ffmpeg

 ;本地存储所将要保存的根目录。如果不存在，程序会尝试创建该目录。
-m3u8_dir_path=~/Downloads/EasyDarwinGoM3u8
+m3u8_dir_path=/Users/ze/Downloads/EasyDarwinGoM3u8

-;切片文件时长。本地存储时，将以该时间段为标准来生成ts文件，单位秒
-ts_duration_second=600
+;切片文件时长。本地存储时，将以该时间段为标准来生成ts文件(该时间+一个I帧间隔)，单位秒。
+;如果需要直播，这个值设小点，但是这样会产生很多ts文件；如果不需要直播，只要存储的话，可设大些。
+ts_duration_second=6
+
+;key为拉流时的自定义路径，value为ffmpeg转码格式，比如可设置为-c:v copy -c:a copy，表示copy源格式；default表示使用ffmpeg内置的输出格式，会进行转码。
+/stream_265=default
--- a/www/apidoc/api_data.js
+++ b/www/apidoc/api_data.js
--- a/www/apidoc/api_data.json
+++ b/www/apidoc/api_data.json
--- a/www/apidoc/api_project.js
+++ b/www/apidoc/api_project.js
@ -1,32 +1 @@
-define({
-  "name": "EasyDarwin",
-  "title": "EasyDarwin API Reference",
-  "order": [
-    "stats",
-    "Pushers",
-    "Players",
-    "stream",
-    "StreamStart",
-    "StreamStop",
-    "record",
-    "RecordFolders",
-    "RecordFiles",
-    "sys",
-    "Login",
-    "Logout",
-    "GetUserInfo",
-    "ModifyPassword",
-    "GetServerInfo"
-  ],
-  "version": "8.1.0",
-  "description": "EasyDarwin Open Source Media Server",
-  "sampleUrl": false,
-  "defaultVersion": "0.0.0",
-  "apidoc": "0.3.0",
-  "generator": {
-    "name": "apidoc",
-    "time": "2018-12-03T05:50:19.289Z",
-    "url": "http://apidocjs.com",
-    "version": "0.17.7"
-  }
-});
+define({
  "name": "EasyDarwin",
  "title": "EasyDarwin API Reference",
  "order": [
    "stats",
    "Pushers",
    "Players",
    "stream",
    "StreamStart",
    "StreamStop",
    "record",
    "RecordFolders",
    "RecordFiles",
    "sys",
    "Login",
    "Logout",
    "GetUserInfo",
    "ModifyPassword",
    "GetServerInfo"
  ],
  "version": "8.1.0",
  "description": "EasyDarwin Open Source Media Server",
  "sampleUrl": false,
  "defaultVersion": "0.0.0",
  "apidoc": "0.3.0",
  "generator": {
    "name": "apidoc",
    "time": "2018-12-21T10:04:58.761Z",
    "url": "http://apidocjs.com",
    "version": "0.17.7"
  }
});
--- a/www/apidoc/api_project.json
+++ b/www/apidoc/api_project.json
@ -1,32 +1 @@
-{
-  "name": "EasyDarwin",
-  "title": "EasyDarwin API Reference",
-  "order": [
-    "stats",
-    "Pushers",
-    "Players",
-    "stream",
-    "StreamStart",
-    "StreamStop",
-    "record",
-    "RecordFolders",
-    "RecordFiles",
-    "sys",
-    "Login",
-    "Logout",
-    "GetUserInfo",
-    "ModifyPassword",
-    "GetServerInfo"
-  ],
-  "version": "8.1.0",
-  "description": "EasyDarwin Open Source Media Server",
-  "sampleUrl": false,
-  "defaultVersion": "0.0.0",
-  "apidoc": "0.3.0",
-  "generator": {
-    "name": "apidoc",
-    "time": "2018-12-03T05:50:19.289Z",
-    "url": "http://apidocjs.com",
-    "version": "0.17.7"
-  }
-}
+{
  "name": "EasyDarwin",
  "title": "EasyDarwin API Reference",
  "order": [
    "stats",
    "Pushers",
    "Players",
    "stream",
    "StreamStart",
    "StreamStop",
    "record",
    "RecordFolders",
    "RecordFiles",
    "sys",
    "Login",
    "Logout",
    "GetUserInfo",
    "ModifyPassword",
    "GetServerInfo"
  ],
  "version": "8.1.0",
  "description": "EasyDarwin Open Source Media Server",
  "sampleUrl": false,
  "defaultVersion": "0.0.0",
  "apidoc": "0.3.0",
  "generator": {
    "name": "apidoc",
    "time": "2018-12-21T10:04:58.761Z",
    "url": "http://apidocjs.com",
    "version": "0.17.7"
  }
}
--- a/www/css/index.09a1f19a.css
+++ b/www/css/index.09a1f19a.css
--- a/www/css/login.cf365b39.css
+++ b/www/css/login.cf365b39.css
--- a/www/index.html
+++ b/www/index.html
@ -7,9 +7,9 @@
        <meta content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no" name="viewport">
        <script src="js/jquery-2.2.4.js"></script>     
        <script src="js/easy-player-lib.min.js"></script>     
-    <link href="css/index.09a1f19a.css" rel="stylesheet"></head>
+    <link href="css/index.df402ff2.css" rel="stylesheet"></head>
    <body class="skin-green sidebar-mini">
        <div id="app"></div>

-    <script type="text/javascript" src="js/index.09a1f19a.js"></script></body>
+    <script type="text/javascript" src="js/index.df402ff2.js"></script></body>
 </html>
--- a/www/js/about.97dd1715.js
+++ b/www/js/about.97dd1715.js
@ -1 +0,0 @@
-webpackJsonp([4],{OjLt:function(t,e,r){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var n=Object.assign||function(t){for(var e=1;e<arguments.length;e++){var r=arguments[e];for(var n in r)Object.prototype.hasOwnProperty.call(r,n)&&(t[n]=r[n])}return t},s=r("NYxO"),i=r("PJh5"),a=function(t){return t&&t.__esModule?t:{default:t}}(i);e.default={data:function(){return{timer:0,runningTime:""}},computed:n({},(0,s.mapState)(["serverInfo"])),mounted:function(){var t=this;this.timer=setInterval(function(){if(t.serverInfo&&t.serverInfo.StartUpTime){var e=(0,a.default)(t.serverInfo.StartUpTime,"YYYY-MM-DD HH:mm:ss"),r=(0,a.default)(),n=a.default.duration(r.diff(e));t.runningTime=parseInt(n.asDays())+" Days "+n.hours()+" Hours "+n.minutes()+" Mins "+n.seconds()+" Secs"}},1e3)},beforeDestroy:function(){this.timer&&(clearInterval(this.timer),this.timer=0)},methods:{}}},qCDb:function(t,e,r){"use strict";r.d(e,"a",function(){return n}),r.d(e,"b",function(){return s});var n=function(){var t=this,e=t.$createElement,r=t._self._c||e;return r("div",{staticClass:"container-fluid no-padding"},[r("div",{staticClass:"col-lg-offset-2 col-lg-8 no-padding server-info"},[r("div",{staticClass:"box box-widget"},[t._m(0),t._v(" "),r("div",{staticClass:"box-body table-responsive no-padding"},[r("table",{staticClass:"table table-striped"},[r("tbody",[r("tr",[r("td",{staticStyle:{width:"20%"}},[t._v("硬件信息")]),t._v(" "),r("td",[r("span",{attrs:{id:"hardware-info"}},[t._v(t._s(t.serverInfo.Hardware))])])]),t._v(" "),r("tr",[r("td",[t._v("接口版本")]),t._v(" "),r("td",[r("span",{attrs:{id:"interface-info"}},[t._v(t._s(t.serverInfo.InterfaceVersion))])])]),t._v(" "),r("tr",[r("td",[t._v("运行时间")]),t._v(" "),r("td",[r("span",{attrs:{id:"running-time-info"}},[t._v(t._s(t.runningTime||t.serverInfo.RunningTime))])])]),t._v(" "),r("tr",[r("td",[t._v("软件信息")]),t._v(" "),r("td",[r("span",{attrs:{id:"software-info"}},[t._v(t._s(t.serverInfo.Server))])])])])])])])])])},s=[function(){var t=this,e=t.$createElement,r=t._self._c||e;return r("div",{staticClass:"box-header"},[r("h3",[r("i",{staticClass:"fa fa-support"}),t._v(" 版本信息")])])}]},sZXX:function(t,e,r){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var n=r("OjLt"),s=r.n(n);for(var i in n)"default"!==i&&function(t){r.d(e,t,function(){return n[t]})}(i);var a=r("qCDb"),o=r("XyMi"),d=Object(o.a)(s.a,a.a,a.b,!1,null,null,null);e.default=d.exports}});
--- a/www/js/dashboard.bf9956ff.js
+++ b/www/js/dashboard.bf9956ff.js
@ -1 +0,0 @@
-webpackJsonp([3],{QYg8:function(t,e,s){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var n=Object.assign||function(t){for(var e=1;e<arguments.length;e++){var s=arguments[e];for(var n in s)Object.prototype.hasOwnProperty.call(s,n)&&(t[n]=s[n])}return t},a=s("PJh5"),i=(function(t){t&&t.__esModule}(a),s("NYxO"));e.default={data:function(){return{timer:0,memSettings:{area:!0,xAxisType:"time",yAxisType:["percent"],min:[0],max:[1]},cntSettings:{area:!0,xAxisType:"time",yAxisType:["normal"],min:[0],max:[100]}}},mounted:function(){var t=this;this.timer=setInterval(function(){t.getServerInfo()},2e3)},beforeDestroy:function(){this.timer&&(clearInterval(this.timer),this.timer=0)},computed:n({},(0,i.mapState)(["serverInfo"]),{cpuData:function(){return{columns:["time","使用"],rows:this.serverInfo?this.serverInfo.cpuData:[]}},memData:function(){return{columns:["time","使用"],rows:this.serverInfo?this.serverInfo.memData:[]}},pusherData:function(){return{columns:["time","总数"],rows:this.serverInfo?this.serverInfo.pusherData:[]}},playerData:function(){return{columns:["time","总数"],rows:this.serverInfo?this.serverInfo.playerData:[]}}}),methods:n({},(0,i.mapActions)(["getServerInfo"]))}},pmXR:function(t,e,s){"use strict";s.d(e,"a",function(){return n}),s.d(e,"b",function(){return a});var n=function(){var t=this,e=t.$createElement,s=t._self._c||e;return s("div",{staticClass:"container-fluid no-padding"},[s("div",{staticClass:"row"},[s("div",{staticClass:"col-md-6"},[s("div",{staticClass:"panel"},[s("div",{staticClass:"panel-body"},[s("ve-line",{attrs:{data:t.cpuData,settings:t.memSettings,"legend-visible":!1,title:{text:"CPU使用",left:"center"}}})],1)])]),t._v(" "),s("div",{staticClass:"col-md-6"},[s("div",{staticClass:"panel"},[s("div",{staticClass:"panel-body"},[s("ve-line",{attrs:{data:t.memData,settings:t.memSettings,"legend-visible":!1,title:{text:"内存使用",left:"center"}}})],1)])]),t._v(" "),s("div",{staticClass:"col-md-6"},[s("div",{staticClass:"panel"},[s("div",{staticClass:"panel-body"},[s("ve-line",{attrs:{data:t.pusherData,settings:t.cntSettings,"legend-visible":!1,title:{text:"推流统计",left:"center"}}})],1)])]),t._v(" "),s("div",{staticClass:"col-md-6"},[s("div",{staticClass:"panel"},[s("div",{staticClass:"panel-body"},[s("ve-line",{attrs:{data:t.playerData,settings:t.cntSettings,"legend-visible":!1,title:{text:"拉流统计",left:"center"}}})],1)])])])])},a=[]},"w+5F":function(t,e,s){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var n=s("QYg8"),a=s.n(n);for(var i in n)"default"!==i&&function(t){s.d(e,t,function(){return n[t]})}(i);var r=s("pmXR"),l=s("XyMi"),o=Object(l.a)(a.a,r.a,r.b,!1,null,null,null);e.default=o.exports}});
--- a/www/js/index.09a1f19a.js
+++ b/www/js/index.09a1f19a.js
--- a/www/js/login.cf365b39.js
+++ b/www/js/login.cf365b39.js
--- a/www/js/players.b31790a6.js
+++ b/www/js/players.b31790a6.js
--- a/www/js/pushers.62efb579.js
+++ b/www/js/pushers.62efb579.js
--- a/www/js/user.61d338c1.js
+++ b/www/js/user.61d338c1.js
--- a/www/login.html
+++ b/www/login.html
@ -6,8 +6,8 @@
        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
        <meta content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no" name="viewport"> 
        <script src="js/jquery-2.2.4.js"></script>
-    <link href="css/login.cf365b39.css" rel="stylesheet"></head>
+    <link href="css/login.9556aee7.css" rel="stylesheet"></head>
    <body class="hold-transition login-page">
        <div id="app"></div>      
-    <script type="text/javascript" src="js/login.cf365b39.js"></script></body>
+    <script type="text/javascript" src="js/login.9556aee7.js"></script></body>
 </html>
				`@ -1 +0,0 @@`
				webpackJsonp([4],{OjLt:function(t,e,r){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var n=Object.assign\|\|function(t){for(var e=1;e<arguments.length;e++){var r=arguments[e];for(var n in r)Object.prototype.hasOwnProperty.call(r,n)&&(t[n]=r[n])}return t},s=r("NYxO"),i=r("PJh5"),a=function(t){return t&&t.__esModule?t:{default:t}}(i);e.default={data:function(){return{timer:0,runningTime:""}},computed:n({},(0,s.mapState)(["serverInfo"])),mounted:function(){var t=this;this.timer=setInterval(function(){if(t.serverInfo&&t.serverInfo.StartUpTime){var e=(0,a.default)(t.serverInfo.StartUpTime,"YYYY-MM-DD HH:mm:ss"),r=(0,a.default)(),n=a.default.duration(r.diff(e));t.runningTime=parseInt(n.asDays())+" Days "+n.hours()+" Hours "+n.minutes()+" Mins "+n.seconds()+" Secs"}},1e3)},beforeDestroy:function(){this.timer&&(clearInterval(this.timer),this.timer=0)},methods:{}}},qCDb:function(t,e,r){"use strict";r.d(e,"a",function(){return n}),r.d(e,"b",function(){return s});var n=function(){var t=this,e=t.$createElement,r=t._self._c\|\|e;return r("div",{staticClass:"container-fluid no-padding"},[r("div",{staticClass:"col-lg-offset-2 col-lg-8 no-padding server-info"},[r("div",{staticClass:"box box-widget"},[t._m(0),t._v(" "),r("div",{staticClass:"box-body table-responsive no-padding"},[r("table",{staticClass:"table table-striped"},[r("tbody",[r("tr",[r("td",{staticStyle:{width:"20%"}},[t._v("硬件信息")]),t._v(" "),r("td",[r("span",{attrs:{id:"hardware-info"}},[t._v(t._s(t.serverInfo.Hardware))])])]),t._v(" "),r("tr",[r("td",[t._v("接口版本")]),t._v(" "),r("td",[r("span",{attrs:{id:"interface-info"}},[t._v(t._s(t.serverInfo.InterfaceVersion))])])]),t._v(" "),r("tr",[r("td",[t._v("运行时间")]),t._v(" "),r("td",[r("span",{attrs:{id:"running-time-info"}},[t._v(t._s(t.runningTime\|\|t.serverInfo.RunningTime))])])]),t._v(" "),r("tr",[r("td",[t._v("软件信息")]),t._v(" "),r("td",[r("span",{attrs:{id:"software-info"}},[t._v(t._s(t.serverInfo.Server))])])])])])])])])])},s=[function(){var t=this,e=t.$createElement,r=t._self._c\|\|e;return r("div",{staticClass:"box-header"},[r("h3",[r("i",{staticClass:"fa fa-support"}),t._v(" 版本信息")])])}]},sZXX:function(t,e,r){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var n=r("OjLt"),s=r.n(n);for(var i in n)"default"!==i&&function(t){r.d(e,t,function(){return n[t]})}(i);var a=r("qCDb"),o=r("XyMi"),d=Object(o.a)(s.a,a.a,a.b,!1,null,null,null);e.default=d.exports}});
				`@ -1 +0,0 @@`
				webpackJsonp([3],{QYg8:function(t,e,s){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var n=Object.assign\|\|function(t){for(var e=1;e<arguments.length;e++){var s=arguments[e];for(var n in s)Object.prototype.hasOwnProperty.call(s,n)&&(t[n]=s[n])}return t},a=s("PJh5"),i=(function(t){t&&t.__esModule}(a),s("NYxO"));e.default={data:function(){return{timer:0,memSettings:{area:!0,xAxisType:"time",yAxisType:["percent"],min:[0],max:[1]},cntSettings:{area:!0,xAxisType:"time",yAxisType:["normal"],min:[0],max:[100]}}},mounted:function(){var t=this;this.timer=setInterval(function(){t.getServerInfo()},2e3)},beforeDestroy:function(){this.timer&&(clearInterval(this.timer),this.timer=0)},computed:n({},(0,i.mapState)(["serverInfo"]),{cpuData:function(){return{columns:["time","使用"],rows:this.serverInfo?this.serverInfo.cpuData:[]}},memData:function(){return{columns:["time","使用"],rows:this.serverInfo?this.serverInfo.memData:[]}},pusherData:function(){return{columns:["time","总数"],rows:this.serverInfo?this.serverInfo.pusherData:[]}},playerData:function(){return{columns:["time","总数"],rows:this.serverInfo?this.serverInfo.playerData:[]}}}),methods:n({},(0,i.mapActions)(["getServerInfo"]))}},pmXR:function(t,e,s){"use strict";s.d(e,"a",function(){return n}),s.d(e,"b",function(){return a});var n=function(){var t=this,e=t.$createElement,s=t._self._c\|\|e;return s("div",{staticClass:"container-fluid no-padding"},[s("div",{staticClass:"row"},[s("div",{staticClass:"col-md-6"},[s("div",{staticClass:"panel"},[s("div",{staticClass:"panel-body"},[s("ve-line",{attrs:{data:t.cpuData,settings:t.memSettings,"legend-visible":!1,title:{text:"CPU使用",left:"center"}}})],1)])]),t._v(" "),s("div",{staticClass:"col-md-6"},[s("div",{staticClass:"panel"},[s("div",{staticClass:"panel-body"},[s("ve-line",{attrs:{data:t.memData,settings:t.memSettings,"legend-visible":!1,title:{text:"内存使用",left:"center"}}})],1)])]),t._v(" "),s("div",{staticClass:"col-md-6"},[s("div",{staticClass:"panel"},[s("div",{staticClass:"panel-body"},[s("ve-line",{attrs:{data:t.pusherData,settings:t.cntSettings,"legend-visible":!1,title:{text:"推流统计",left:"center"}}})],1)])]),t._v(" "),s("div",{staticClass:"col-md-6"},[s("div",{staticClass:"panel"},[s("div",{staticClass:"panel-body"},[s("ve-line",{attrs:{data:t.playerData,settings:t.cntSettings,"legend-visible":!1,title:{text:"拉流统计",left:"center"}}})],1)])])])])},a=[]},"w+5F":function(t,e,s){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var n=s("QYg8"),a=s.n(n);for(var i in n)"default"!==i&&function(t){s.d(e,t,function(){return n[t]})}(i);var r=s("pmXR"),l=s("XyMi"),o=Object(l.a)(a.a,r.a,r.b,!1,null,null,null);e.default=o.exports}});